Merge pull request rancher#44181 from igomez06/v2.7-update-on-tag-matrix

[v2.7] Configuration updates for the onTag Jobs
caliskanugur · Jan 23, 2024 · c5aded8 · c5aded8
2 parents 8379ceb + 11ed764
commit c5aded8
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 11 deletions.
diff --git a/tests/v2/validation/Jenkinsfile.recurring b/tests/v2/validation/Jenkinsfile.recurring
@@ -249,7 +249,7 @@ node {
                           text(name: 'CONFIG', value: configYaml),
                           string(name: 'REPO', value: "${rancherRepo}"),
                           string(name: 'BRANCH', value: "${branch}"),
-                          string(name: 'TEST_RUN_ID', value: "${testRunID}"),
+                          string(name: 'QASE_TEST_RUN_ID', value: "${testRunID}"),
                           string(name: 'TEST_PACKAGE', value: "${env.TEST_PACKAGE}"),
                           string(name: 'GOTEST_TESTCASE', value: "${runFlag} -p 1"),
                           string(name: 'TAGS', value: tags),
@@ -271,7 +271,7 @@ node {
                         text(name: 'CONFIG', value: configYaml),
                         string(name: 'REPO', value: "${rancherRepo}"),
                         string(name: 'BRANCH', value: "${branch}"),
-                        string(name: 'TEST_RUN', value: "${env.TEST_RUN}"),
+                        string(name: 'QASE_TEST_RUN_ID', value: "${testRunID}"),
                         string(name: 'TEST_PACKAGE', value: "${env.TEST_PACKAGE}"),
                         string(name: 'TAGS', value: "${env.TAGS}"),
                         string(name: 'GOTEST_TESTCASE', value: "${env.GOTEST_TESTCASE} -p 1"),

diff --git a/tests/v2/validation/pipeline/Jenkinsfile_release_upgrade b/tests/v2/validation/pipeline/Jenkinsfile_release_upgrade
@@ -287,7 +287,7 @@ node {
                        def containerName = "${job_name}${env.BUILD_NUMBER}_$it-provisioning"
                        try {
                          sh "docker run --name ${containerName} -t -e CATTLE_TEST_CONFIG=\"${absoluteConfigPath}\" " +
-                       "${imageName} sh -c \"/root/go/bin/gotestsum --format standard-verbose --packages=\"${testsDir}${testPackage}\" --junitfile ${testResultsOut} -- ${testCase} -timeout=\"60m\" -v\""
+                       "${imageName} sh -c \"/root/go/bin/gotestsum --format standard-verbose --packages=\"${testsDir}${testPackage}\" --junitfile ${testResultsOut} -- -tags=validation ${testCase} -timeout=\"60m\" -v\""
 
                         dir("./${patchedConfigsDir}") {
                           sh "docker cp ${containerName}:${rootPath}${configsDir}/$it ."

diff --git a/tests/validation/tests/v3_api/scripts/pipeline/Jenkinsfile_ontag_matrix b/tests/validation/tests/v3_api/scripts/pipeline/Jenkinsfile_ontag_matrix
@@ -230,14 +230,12 @@ if ( true == via_webhook() && (!(rancher_version ==~ rancher_version_regex)) ) {
                       jobs["go-provisioning"] = { build job: 'rancher_ontag_go_certification', parameters: goParams }
                       // windows note: https://github.com/rancher/dashboard/issues/6549
                       // jobs["windows"] = { build job: 'rancher-v3_ontag_windows_certification', parameters: params}
-                      if (rancher_version.startsWith("v2.6") || rancher_version.startsWith("v2.7")){
-                        // Rancher server 2 is used to test GKE, EKS, AKS and Imported clusters.
-                        jobs["eks"] = { build job: 'rancher-v3_ontag_eks_certification', parameters: params2 }
-                        jobs["aks"] = { build job: 'rancher-v3_ontag_aks_certification', parameters: params2 }
-                        // gke note: https://github.com/rancher/qa-tasks/issues/429
-                        // jobs["gke"] = { build job: 'rancher-v3_ontag_gke_certification', parameters: params2 }
+                      // Rancher server 2 is used to test GKE, EKS, AKS and Imported clusters.
+                      jobs["eks"] = { build job: 'rancher-v3_ontag_eks_certification', parameters: params2 }
+                      jobs["aks"] = { build job: 'rancher-v3_ontag_aks_certification', parameters: params2 }
+                      // gke note: https://github.com/rancher/qa-tasks/issues/429
+                      // jobs["gke"] = { build job: 'rancher-v3_ontag_gke_certification', parameters: params2 }
 
-                      }
                       jobs["import"] = { build job: 'rancher-v3_ontag_import_certification', parameters: params2}
                       jobs["importk3s"] = { build job: 'rancher-v3_ontag_import_k3s_certification', parameters: params2}
 

diff --git a/tests/validation/tests/v3_api/test_rke_cluster_provisioning.py b/tests/validation/tests/v3_api/test_rke_cluster_provisioning.py
@@ -952,7 +952,7 @@ def node_template_az():
             "dockerPort": "2376",
             "environment": "AzurePublicCloud",
             "faultDomainCount": "3",
-            "image": "canonical:UbuntuServer:18.04-LTS:latest",
+            "image": "Canonical:0001-com-ubuntu-server-jammy:22_04-lts:latest",
             "location": "westus",
             "managedDisks": False,
             "noPublicIp": False,