Skip to content

Commit 1972e0e

Browse files
Kaniska244Kaniska244
committed
Modified test scripts as per review comments
1 parent 50acd1c commit 1972e0e

4 files changed

Lines changed: 36 additions & 36 deletions

File tree

‎test/oryx/install_dotnet_and_oryx.sh‎

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -12,33 +12,33 @@ check "Oryx version" oryx --version
1212
check "Dotnet is not removed if it is not installed by the Oryx Feature" dotnet --version
1313

1414
# Install platforms with oryx build tool
15-
check "oryx-install-dotnet-8.0" oryx prep --skip-detection --platforms-and-versions dotnet=8.0.23
16-
check "dotnet-2-installed-by-oryx" ls /opt/dotnet/ | grep 8.0
15+
check "oryx-install-dotnet-10.0" oryx prep --skip-detection --platforms-and-versions dotnet=10.0.4
16+
check "dotnet-10-installed-by-oryx" ls /opt/dotnet/ | grep 10.0
1717

18-
check "oryx-install-nodejs-20.11.0" oryx prep --skip-detection --platforms-and-versions nodejs=20.11.0
19-
check "nodejs-20.11.0-installed-by-oryx" ls /opt/nodejs/ | grep 20.11.0
18+
check "oryx-install-nodejs-24.13.0" oryx prep --skip-detection --platforms-and-versions nodejs=24.13.0
19+
check "nodejs-24.13.0-installed-by-oryx" ls /opt/nodejs/ | grep 24.13.0
2020

21-
check "oryx-install-php-8.1.30" oryx prep --skip-detection --platforms-and-versions php=8.1.30
22-
check "php-8.1.30-installed-by-oryx" ls /opt/php/ | grep 8.1.30
21+
check "oryx-install-php-8.5.1" oryx prep --skip-detection --platforms-and-versions php=8.5.1
22+
check "php-8.5.1-installed-by-oryx" ls /opt/php/ | grep 8.5.1
2323

2424
# Replicates Oryx's behavior for universal image
2525
mkdir -p /opt/oryx
26-
echo "vso-focal" >> /opt/oryx/.imagetype
26+
echo "vso-bookworm" >> /opt/oryx/.imagetype
2727

2828
mkdir -p /opt/dotnet/lts
2929
cp -R /usr/share/dotnet/dotnet /opt/dotnet/lts
3030
cp -R /usr/share/dotnet/LICENSE.txt /opt/dotnet/lts
3131
cp -R /usr/share/dotnet/ThirdPartyNotices.txt /opt/dotnet/lts
3232

3333
# Install platforms with oryx build tool
34-
check "oryx-install-dotnet-8.0" oryx prep --skip-detection --platforms-and-versions dotnet=8.0.23
35-
check "dotnet-2-installed-by-oryx" ls /opt/dotnet/ | grep 8.0
34+
check "oryx-install-dotnet-10.0" oryx prep --skip-detection --platforms-and-versions dotnet=10.0.4
35+
check "dotnet-10-installed-by-oryx" ls /opt/dotnet/ | grep 10.0
3636

37-
check "oryx-install-nodejs-20.11.0" oryx prep --skip-detection --platforms-and-versions nodejs=20.11.0
38-
check "nodejs-20.11.0-installed-by-oryx" ls /opt/nodejs/ | grep 20.11.0
37+
check "oryx-install-nodejs-24.13.0" oryx prep --skip-detection --platforms-and-versions nodejs=24.13.0
38+
check "nodejs-24.13.0-installed-by-oryx" ls /opt/nodejs/ | grep 24.13.0
3939

40-
check "oryx-install-php-8.1.30" oryx prep --skip-detection --platforms-and-versions php=8.1.30
41-
check "php-8.1.30-installed-by-oryx" ls /opt/php/ | grep 8.1.30
40+
check "oryx-install-php-8.5.1" oryx prep --skip-detection --platforms-and-versions php=8.5.1
41+
check "php-8.5.1-installed-by-oryx" ls /opt/php/ | grep 8.5.1
4242

4343
# Report result
4444
reportResults

‎test/oryx/install_older_dotnet_and_oryx.sh‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -9,33 +9,33 @@ check "Oryx version" oryx --version
99
check "Dotnet is not removed if it is not installed by the Oryx Feature" dotnet --version
1010

1111
# Install platforms with oryx build tool
12-
check "oryx-install-dotnet-8.0" oryx prep --skip-detection --platforms-and-versions dotnet=8.0.23
13-
check "dotnet-2-installed-by-oryx" ls /opt/dotnet/ | grep 8.0
12+
check "oryx-install-dotnet-6.0" oryx prep --skip-detection --platforms-and-versions dotnet=6.0.23
13+
check "dotnet-6-installed-by-oryx" ls /opt/dotnet/ | grep 6.0
1414

1515
check "oryx-install-nodejs-20.11.0" oryx prep --skip-detection --platforms-and-versions nodejs=20.11.0
1616
check "nodejs-20.11.0-installed-by-oryx" ls /opt/nodejs/ | grep 20.11.0
1717

18-
check "oryx-install-php-8.1.30" oryx prep --skip-detection --platforms-and-versions php=8.1.30
19-
check "php-8.1.30-installed-by-oryx" ls /opt/php/ | grep 8.1.30
18+
check "oryx-install-php-8.1.22" oryx prep --skip-detection --platforms-and-versions php=8.1.22
19+
check "php-8.1.22-installed-by-oryx" ls /opt/php/ | grep 8.1.22
2020

2121
# Replicates Oryx's behavior for universal image
2222
mkdir -p /opt/oryx
23-
echo "vso-focal" >> /opt/oryx/.imagetype
23+
echo "vso-bookworm" >> /opt/oryx/.imagetype
2424

2525
mkdir -p /opt/dotnet/lts
2626
cp -R /usr/share/dotnet/dotnet /opt/dotnet/lts
2727
cp -R /usr/share/dotnet/LICENSE.txt /opt/dotnet/lts
2828
cp -R /usr/share/dotnet/ThirdPartyNotices.txt /opt/dotnet/lts
2929

3030
# Install platforms with oryx build tool
31-
check "oryx-install-dotnet-8.0" oryx prep --skip-detection --platforms-and-versions dotnet=8.0.23
32-
check "dotnet-2-installed-by-oryx" ls /opt/dotnet/ | grep 8.0
31+
check "oryx-install-dotnet-6.0" oryx prep --skip-detection --platforms-and-versions dotnet=6.0.23
32+
check "dotnet-6-installed-by-oryx" ls /opt/dotnet/ | grep 6.0
3333

3434
check "oryx-install-nodejs-20.11.0" oryx prep --skip-detection --platforms-and-versions nodejs=20.11.0
3535
check "nodejs-20.11.0-installed-by-oryx" ls /opt/nodejs/ | grep 20.11.0
3636

37-
check "oryx-install-php-8.1.30" oryx prep --skip-detection --platforms-and-versions php=8.1.30
38-
check "php-8.1.30-installed-by-oryx" ls /opt/php/ | grep 8.1.30
37+
check "oryx-install-php-8.1.22" oryx prep --skip-detection --platforms-and-versions php=8.1.22
38+
check "php-8.1.22-installed-by-oryx" ls /opt/php/ | grep 8.1.22
3939

4040
# Report result
4141
reportResults

‎test/oryx/install_prev_dotnet_and_oryx.sh‎

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -9,33 +9,33 @@ check "Oryx version" oryx --version
99
check "Dotnet is not removed if it is not installed by the Oryx Feature" dotnet --version
1010

1111
# Install platforms with oryx build tool
12-
check "oryx-install-dotnet-8.0" oryx prep --skip-detection --platforms-and-versions dotnet=8.0.23
13-
check "dotnet-2-installed-by-oryx" ls /opt/dotnet/ | grep 8.0
12+
check "oryx-install-dotnet-9.0" oryx prep --skip-detection --platforms-and-versions dotnet=9.0.1
13+
check "dotnet-9-installed-by-oryx" ls /opt/dotnet/ | grep 9.0
1414

15-
check "oryx-install-nodejs-20.11.0" oryx prep --skip-detection --platforms-and-versions nodejs=20.11.0
16-
check "nodejs-20.11.0-installed-by-oryx" ls /opt/nodejs/ | grep 20.11.0
15+
check "oryx-install-nodejs-22.9.0" oryx prep --skip-detection --platforms-and-versions nodejs=22.9.0
16+
check "nodejs-22.9.0-installed-by-oryx" ls /opt/nodejs/ | grep 22.9.0
1717

18-
check "oryx-install-php-8.1.30" oryx prep --skip-detection --platforms-and-versions php=8.1.30
19-
check "php-8.1.30-installed-by-oryx" ls /opt/php/ | grep 8.1.30
18+
check "oryx-install-php-8.3.20" oryx prep --skip-detection --platforms-and-versions php=8.3.20
19+
check "php-8.3.20-installed-by-oryx" ls /opt/php/ | grep 8.3.20
2020

2121
# Replicates Oryx's behavior for universal image
2222
mkdir -p /opt/oryx
23-
echo "vso-focal" >> /opt/oryx/.imagetype
23+
echo "vso-bookworm" >> /opt/oryx/.imagetype
2424

2525
mkdir -p /opt/dotnet/lts
2626
cp -R /usr/share/dotnet/dotnet /opt/dotnet/lts
2727
cp -R /usr/share/dotnet/LICENSE.txt /opt/dotnet/lts
2828
cp -R /usr/share/dotnet/ThirdPartyNotices.txt /opt/dotnet/lts
2929

3030
# Install platforms with oryx build tool
31-
check "oryx-install-dotnet-8.0" oryx prep --skip-detection --platforms-and-versions dotnet=8.0.23
32-
check "dotnet-2-installed-by-oryx" ls /opt/dotnet/ | grep 8.0
31+
check "oryx-install-dotnet-9.0" oryx prep --skip-detection --platforms-and-versions dotnet=9.0.1
32+
check "dotnet-9-installed-by-oryx" ls /opt/dotnet/ | grep 9.0
3333

34-
check "oryx-install-nodejs-20.11.0" oryx prep --skip-detection --platforms-and-versions nodejs=20.11.0
35-
check "nodejs-20.11.0-installed-by-oryx" ls /opt/nodejs/ | grep 20.11.0
34+
check "oryx-install-nodejs-22.9.0" oryx prep --skip-detection --platforms-and-versions nodejs=22.9.0
35+
check "nodejs-22.9.0-installed-by-oryx" ls /opt/nodejs/ | grep 22.9.0
3636

37-
check "oryx-install-php-8.1.30" oryx prep --skip-detection --platforms-and-versions php=8.1.30
38-
check "php-8.1.30-installed-by-oryx" ls /opt/php/ | grep 8.1.30
37+
check "oryx-install-php-8.3.20" oryx prep --skip-detection --platforms-and-versions php=8.3.20
38+
check "php-8.3.20-installed-by-oryx" ls /opt/php/ | grep 8.3.20
3939

4040
# Report result
4141
reportResults

‎test/oryx/scenarios.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
"image": "ubuntu:noble",
2424
"features": {
2525
"dotnet": {
26-
"version": "6.0"
26+
"version": "8.0"
2727
},
2828
"oryx": {}
2929
}

0 commit comments

Comments
 (0)