Merge pull request #82 from aslicerh/update-dotnet

Update dotnet for the EOL of .NET 6 and the addition of .NET 9.

Author: aslicerh

deploy-and-test.yml

@@ -18,11 +18,11 @@
     java_17:
       - java-17-container
     java: "{{ java_8 + java_11 + java_17 }}"
-    dotnet_60:
-      - rhel8-dotnet60-container
-    dotnet_70:
-      - rhel8-dotnet70-container
-    dotnet: "{{ dotnet_60 + dotnet_70}}"
+    dotnet_80:
+      - rhel8-dotnet80-container
+    dotnet_90:
+      - rhel8-dotnet90-container
+    dotnet: "{{ dotnet_80 + dotnet_90}}"
   tasks:
     - debug: var=ext_test
     - debug: var=github_repo
@@ -191,4 +191,4 @@
       include_tasks: ./tasks/verify_in_openshift.yml
       loop: "{{ lookup('vars', ext_test) }}"
       when: (ext_test is defined) and (ext_test in
-        ["dotnet", "dotnet_60", "dotnet_70"])
+        ["dotnet", "dotnet_80", "dotnet_90"])

vars/rhel8-dotnet60-container.yml renamed to vars/rhel8-dotnet80-container.yml

@@ -1,11 +1,11 @@
-registry_redhat_io: "rhel8/dotnet-60"
-tag_name: "dotnet60"
-deployment: "oc new-app dotnet60:latest~https://github.com/redhat-developer/s2i-dotnetcore-ex#dotnet-6.0 --context-dir=app"
+registry_redhat_io: "rhel8/dotnet-80"
+tag_name: "dotnet80"
+deployment: "oc new-app dotnet80:latest~https://github.com/redhat-developer/s2i-dotnetcore-ex#dotnet-8.0 --context-dir=app"
 pod_name: "s2i-dotnetcore-ex"
 add_route: true
 check_curl_output: "Web apps with ASP.NET Core"
 is_name: "dotnet"
 test_exec_command: "./files/check_oc_exec_output.sh 'dotnet --info'"
-expected_exec_result: "Version:*6.0"
+expected_exec_result: "Version:*8.0"
 test_exec_command: "./files/check_oc_exec_output.sh '$(dirname $(readlink -f $(command -v dotnet)))/shared/Microsoft.NETCore.App/*/createdump --full 1 2>&1'"
 expected_exec_result: "Dump successfully written"

vars/rhel8-dotnet70-container.yml renamed to vars/rhel8-dotnet90-container.yml

@@ -1,11 +1,11 @@
-registry_redhat_io: "rhel8/dotnet-70"
-tag_name: "dotnet70"
-deployment: "oc new-app dotnet70:latest~https://github.com/redhat-developer/s2i-dotnetcore-ex#dotnet-7.0 --context-dir=app"
+registry_redhat_io: "rhel8/dotnet-90"
+tag_name: "dotnet90"
+deployment: "oc new-app dotnet90:latest~https://github.com/redhat-developer/s2i-dotnetcore-ex#dotnet-9.0 --context-dir=app"
 pod_name: "s2i-dotnetcore-ex"
 add_route: true
 check_curl_output: "Web apps with ASP.NET Core"
 is_name: "dotnet"
 test_exec_command: "./files/check_oc_exec_output.sh 'dotnet --info'"
-expected_exec_result: "Version:*7.0"
+expected_exec_result: "Version:*9.0"
 test_exec_command: "./files/check_oc_exec_output.sh '$(dirname $(readlink -f $(command -v dotnet)))/shared/Microsoft.NETCore.App/*/createdump --full 1 2>&1'"
 expected_exec_result: "Dump successfully written"