X-Git-Url: https://gerrit.nordix.org/gitweb?a=blobdiff_plain;f=jjb%2Fmetal3%2Fprojects.yml;h=b2decb34edd8ba2bf94efc11b16f267d5b6be320;hb=2d232d9578ec4397209da2068a2f1c37033bc11a;hp=5a867d61bc3e09584a5eff1f62dbdca7b13e2a8e;hpb=b15411d0f19d0b36a2601e753af6900af4d113b3;p=infra%2Fcicd.git

diff --git a/jjb/metal3/projects.yml b/jjb/metal3/projects.yml
index 5a867d61..b2decb34 100644
--- a/jjb/metal3/projects.yml
+++ b/jjb/metal3/projects.yml
@@ -37,9 +37,9 @@
     jobs:
     - linter_tests
     - openstack_image_building
+    - openstack_node_image_building
     - docker_image_building
     - update_nordix_repos
-    - openstack_node_image_building
     - main_fullstack_building
     - fullstack_building_test
     - metal3_dev_tools_integration_test:
@@ -51,7 +51,7 @@
       org: "Nordix"
       name: "metal3-dev-tools"
     ci_github_jenkins_credentials_id: 'nordix-metal3-ci-github-prod-token'
-    ci_ghprb_auth_id: 'e8a43847-46ff-42db-a5db-7366df0e4ee2'
+    ci_ghprb_auth_id: '86c49704-5474-4524-97b7-805323b2c39a'
     ci_github_repo: 'https://github.com/Nordix/metal3-dev-tools.git'
 
 - project:
@@ -107,10 +107,11 @@
           capi_version: v1beta1
           capm3_version: v1beta1
           capm3_release_branch: release-1.4
-          bmo_release_branch: v0.3.0  # This would point to a tag until we branch out
+          bmo_release_branch: release-0.3
           target_branches:
             - 'main'
             - 'release-1.4'
+            - 'release-0.3'
       - release-1-3:
           capi_version: v1beta1
           capm3_version: v1beta1
@@ -164,10 +165,11 @@
           capi_version: v1beta1
           capm3_version: v1beta1
           capm3_release_branch: release-1.4
-          bmo_release_branch: v0.3.0  # This would point to a tag until we branch out
+          bmo_release_branch: release-0.3
           target_branches:
             - 'main'
             - 'release-1.4'
+            - 'release-0.3'
       - release-1-3:
           capi_version: v1beta1
           capm3_version: v1beta1
@@ -205,7 +207,7 @@
                 capi_version: v1beta1
                 capm3_version: v1beta1
                 capm3_release_branch: release-1.4
-                bmo_release_branch: v0.3.0
+                bmo_release_branch: release-0.3
                 schedule: "30 4 * * *"
             - release-1-3:
                 capi_version: v1beta1
@@ -315,10 +317,11 @@
                 kubectl_sha256: 636ac0eaa467dbceda4b2c4e33662adc9709f5ce40341c9fc1a687fc276ac02d  # v1.26.4
                 k8s_version_upgrade_to: v1.27.4
                 capm3_release_branch: release-1.4
-                bmo_release_branch: v0.3.0
+                bmo_release_branch: release-0.3
                 capm3_target_branch: release-1-4
                 target_branches:
                   - 'release-1.4'
+                  - 'release-0.3'
             - 1-25-1-26:
                 k8s_version_upgrade_from: v1.25.5
                 kubectl_sha256: 6a660cd44db3d4bfe1563f6689cbe2ffb28ee4baf3532e04fff2d7b909081c29  # v1.25.5
@@ -352,10 +355,11 @@
                 capi_version: v1beta1
                 capm3_version: v1beta1
                 capm3_release_branch: release-1.4
-                bmo_release_branch: v0.3.0
+                bmo_release_branch: release-0.3
                 target_branches:
                   - 'main'
                   - 'release-1.4'
+                  - 'release-0.3'
       - capm3_e2e_basic_tests:
           capm3_target_branch:
             - main:
@@ -395,9 +399,10 @@
                 capi_version: v1beta1
                 capm3_version: v1beta1
                 capm3_release_branch: release-1.4
-                bmo_release_branch: v0.3.0
+                bmo_release_branch: release-0.3
                 target_branches:
                   - 'release-1.4'
+                  - 'release-0.3'
             - release-1-3:
                 capi_version: v1beta1
                 capm3_version: v1beta1
@@ -462,9 +467,10 @@
                 capi_version: v1beta1
                 capm3_version: v1beta1
                 capm3_release_branch: release-1.4
-                bmo_release_branch: v0.3.0
+                bmo_release_branch: release-0.3
                 target_branches:
                   - 'release-1.4'
+                  - 'release-0.3'
             - release-1-3:
                 capi_version: v1beta1
                 capm3_version: v1beta1
@@ -528,10 +534,11 @@
                 kubectl_sha256: 636ac0eaa467dbceda4b2c4e33662adc9709f5ce40341c9fc1a687fc276ac02d  # v1.26.4
                 k8s_version_upgrade_to: v1.27.4
                 capm3_release_branch: release-1.4
-                bmo_release_branch: v0.3.0
+                bmo_release_branch: release-0.3
                 capm3_target_branch: release-1-4
                 target_branches:
                   - 'release-1.4'
+                  - 'release-0.3'
             - 1-25-1-26:
                 k8s_version_upgrade_from: v1.25.5
                 kubectl_sha256: 6a660cd44db3d4bfe1563f6689cbe2ffb28ee4baf3532e04fff2d7b909081c29  # v1.25.5
@@ -602,7 +609,7 @@
                 kubectl_sha256: 636ac0eaa467dbceda4b2c4e33662adc9709f5ce40341c9fc1a687fc276ac02d  # v1.26.4
                 k8s_version_upgrade_to: v1.27.4
                 capm3_release_branch: release-1.4
-                bmo_release_branch: v0.3.0
+                bmo_release_branch: release-0.3
                 capm3_target_branch: release-1-4
             - 1-25-1-26:
                 k8s_version_upgrade_from: v1.25.5
@@ -651,7 +658,7 @@
                 capm3_version: v1beta1
                 capm3_branch: release-1.4
                 capm3_release_branch: release-1.4
-                bmo_release_branch: v0.3.0
+                bmo_release_branch: release-0.3
                 schedule: "H 5 * * *"
             - release-1-3:
                 capi_version: v1beta1
@@ -711,5 +718,5 @@
     jobs:
         - container_image_building
     ci_github_jenkins_credentials_id: 'nordix-metal3-ci-github-prod-token'
-    ci_ghprb_auth_id: 'e8a43847-46ff-42db-a5db-7366df0e4ee2'
+    ci_ghprb_auth_id: '86c49704-5474-4524-97b7-805323b2c39a'
     ci_github_repo: 'https://github.com/Nordix/metal3-dev-tools.git'