engine: Avoid using dots in job streams

Change-Id: Ie0537137f8982a9575c927b1f76aa9ce6f742fed

diff --git a/jjb/engine/verify-jobs/kubernetes-verify-deploy-test.yaml b/jjb/engine/verify-jobs/kubernetes-verify-deploy-test.yaml
index 88f64907ec41dcc134bc8f1dff74ab1868eda261..962d0fac4d42a68c62c8ccc29636bd5baa669ebe 100644 (file)
--- a/jjb/engine/verify-jobs/kubernetes-verify-deploy-test.yaml
+++ b/jjb/engine/verify-jobs/kubernetes-verify-deploy-test.yaml
@@ -22,13 +22,16 @@
 
     project: 'kubernetes-verify-deploy-test'
 
+    # NOTE (fdegir): dot is not an allowed character in groovy var names and also for
+    # naming openstack objects so stream is used for that purpose but branch points to
+    # actual branch name on gerrit
     stream:
       - 'master':
-          branch: '{stream}'
-      - '1.17':
-          branch: '{stream}'
-      - '1.15':
-          branch: '{stream}'
+          branch: 'master'
+      - '1_17':
+          branch: '1.17'
+      - '1_15':
+          branch: '1.15'
 
     environment-type:
       - online:

diff --git a/jjb/engine/verify-jobs/kubernetes-verify-package.yaml b/jjb/engine/verify-jobs/kubernetes-verify-package.yaml
index 5d395d91842d8f1b89121a10bf2eb2681d261f94..3866c9a83cb6cf45b697db59ca6d022c96eab8f6 100644 (file)
--- a/jjb/engine/verify-jobs/kubernetes-verify-package.yaml
+++ b/jjb/engine/verify-jobs/kubernetes-verify-package.yaml
@@ -22,9 +22,12 @@
 
     project: 'kubernetes-verify-package'
 
+    # NOTE (fdegir): dot is not an allowed character in groovy var names and also for
+    # naming openstack objects so stream is used for that purpose but branch points to
+    # actual branch name on gerrit
     stream:
       - 'master':
-          branch: '{stream}'
+          branch: 'master'
           openrc-credentials-file: 'est-jenkins-openrcfile-city-frankfurt-cicd'
           execution-mode: 'packaging'
           gated-projects: 'infra/stack/kubernetes|infra/installer/kubespray'
@@ -32,8 +35,8 @@
           failed: false
           unstable: false
           notbuilt: false
-      - '1.17':
-          branch: '{stream}'
+      - '1_17':
+          branch: '1.17'
           openrc-credentials-file: 'est-jenkins-openrcfile-city-frankfurt-cicd'
           execution-mode: 'packaging'
           gated-projects: 'infra/stack/kubernetes|infra/installer/kubespray'
@@ -41,8 +44,8 @@
           failed: false
           unstable: false
           notbuilt: false
-      - '1.15':
-          branch: '{stream}'
+      - '1_15':
+          branch: '1.15'
           openrc-credentials-file: 'est-jenkins-openrcfile-city-frankfurt-cicd'
           execution-mode: 'packaging'
           gated-projects: 'infra/stack/kubernetes|infra/installer/kubespray'

diff --git a/jjb/engine/verify-jobs/kubernetes-verify-tox.yaml b/jjb/engine/verify-jobs/kubernetes-verify-tox.yaml
index 2c192ba35fe6ad720b6d1da20b60c45f6282b681..be17bf36cfab3700d82352cb8d2d6d6b3e0f9020 100644 (file)
--- a/jjb/engine/verify-jobs/kubernetes-verify-tox.yaml
+++ b/jjb/engine/verify-jobs/kubernetes-verify-tox.yaml
@@ -22,15 +22,18 @@
 
     project: 'kubernetes-tox'
 
+    # NOTE (fdegir): dot is not an allowed character in groovy var names and also for
+    # naming openstack objects so stream is used for that purpose but branch points to
+    # actual branch name on gerrit
     stream:
       - 'master':
-          branch: '{stream}'
+          branch: 'master'
           gated-projects: 'infra/stack/kubernetes|infra/installer/kubespray'
-      - '1.17':
-          branch: '{stream}'
+      - '1_17':
+          branch: '1.17'
           gated-projects: 'infra/stack/kubernetes|infra/installer/kubespray'
-      - '1.15':
-          branch: '{stream}'
+      - '1_15':
+          branch: '1.15'
           gated-projects: 'infra/stack/kubernetes|infra/installer/kubespray'
 
     lint-type: