X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;ds=sidebyside;f=jjb%2Freleng%2Freleng-release-jobs.yaml;h=c01e41e57ac86883eff7aba17504e9d259a25967;hb=10076a94d789772e73f2d6da6da1729c05dc3950;hp=3136d7855de8c3f4c919f3fe5e92790578571211;hpb=be58bd44cf41c4c07467040795b9393a194765cb;p=releng.git

diff --git a/jjb/releng/releng-release-jobs.yaml b/jjb/releng/releng-release-jobs.yaml
index 3136d7855..c01e41e57 100644
--- a/jjb/releng/releng-release-jobs.yaml
+++ b/jjb/releng/releng-release-jobs.yaml
@@ -16,6 +16,21 @@
       - fraser
       - gambia
       - hunter
+      - iruya
+      - jerma
+      - kali
+      - leguer
+      - lakelse
+      - moselle
+      - v1.21
+      - v1.22
+      - v1.23
+      - v1.24
+      - v1.25
+      - xena
+      - wallaby
+      - yoga
+      - zed
 
     jobs:
       - 'releng-release-{stream}-verify'
@@ -66,7 +81,7 @@
     builders:
       - shell: !include-raw-escape:
           - releng-release-create-venv.sh
-          - releng-release-tagging.sh
+          - branch-or-tag.sh
 
     publishers:
       - email-jenkins-admins-on-failure
@@ -77,9 +92,9 @@
     parameters:
       - node:
           name: SLAVE_NAME
-          description: 'Only run merge job on build1'
+          description: 'Only run merge job on build5 or 6'
           default-slaves:
-            - lf-build1
+            - lf-build6
           allowed-multiselect: false
           ignore-offline-nodes: true
       - stream-parameter:
@@ -106,8 +121,7 @@
     builders:
       - shell: !include-raw-escape:
           - releng-release-create-venv.sh
-          - releng-release-tagging.sh
-          - releng-release-create-branch.sh
+          - branch-or-tag.sh
 
     publishers:
       - email-jenkins-admins-on-failure