engine: Avoid using dots in job streams

[infra/cicd.git] / jjb / engine / verify-jobs / kubernetes-verify-package.yaml

diff --git a/jjb/engine/verify-jobs/kubernetes-verify-package.yaml b/jjb/engine/verify-jobs/kubernetes-verify-package.yaml
index 2b6bd3deed0304892efdedd8305ce62c742c8413..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'
@@ -102,6 +105,7 @@
             - 'engine-verify-package-.*'
             - 'kubernetes-verify-package-.*'
             - 'onap-verify-package-.*'
+            - 'openstack-verify-package-.*'
           block-level: 'NODE'
       - throttle:
           max-per-node: 1