Change the name of e2e master jobs

[infra/cicd.git] / jjb / airship / job_capi_capm3_v1a5_master_e2e_tests_ubuntu.yml

diff --git a/jjb/airship/job_capi_capm3_v1a5_master_e2e_tests_ubuntu.yml b/jjb/airship/job_capi_capm3_v1a5_master_e2e_tests_ubuntu.yml
index 6e8d022f215e648ea832c38fc65be2878a3ace58..6f8ce00c775a630e63d118fb5c2ae728ab97aafd 100644 (file)
--- a/jjb/airship/job_capi_capm3_v1a5_master_e2e_tests_ubuntu.yml
+++ b/jjb/airship/job_capi_capm3_v1a5_master_e2e_tests_ubuntu.yml
@@ -26,7 +26,7 @@
 
 - job-template:
     id: capi_capm3_v1a5_master_e2e_tests_ubuntu
-    name: '{job_prefix}_{name}_master_e2e_test_ubuntu'
+    name: '{job_prefix}_master_e2e_test_ubuntu'
     description: "CAPM3 v1alpha5 e2e tests for {repo[org]}/{repo[name]} on Ubuntu."
     project-type: pipeline
     defaults: global
@@ -43,7 +43,7 @@
         description: 'Project github repo name'
     - string:
         name: ghprbActualCommit
-        default: 'master'
+        default: 'main'
         description: 'CI Repo branch for triggering manual build'
     - string:
         name: ghprbAuthorRepoGitUrl
@@ -51,7 +51,7 @@
         description: 'CI Repo URL for triggering manual build'
     - string:
         name: ghprbTargetBranch
-        default: 'master'
+        default: 'main'
         description: 'Target branch of the PR'
     - string:
         name: DISTRIBUTION
@@ -81,10 +81,6 @@
         name: TESTS_FOR
         default: "e2e_tests"
         description: 'Tests using the e2e framework.'
-    - string:
-        name: KUBERNETES_VERSION
-        default: "v1.22.0"
-        description: 'Kubernetes version'
 
     properties:
     - build-discarder: