X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=jjb%2Freleng%2Freleng-release-jobs.yaml;h=776f73f85b802f8030b088cd3bd31f5917ec548f;hb=fe01e2d8ea9d3578cbeed5fd2b7ec50950c04b0a;hp=0c059ee9b2c208964784f51f63cf73414048db63;hpb=6fbff5a9eea00ae8a18ff5ae329c5d02115daba0;p=releng.git

diff --git a/jjb/releng/releng-release-jobs.yaml b/jjb/releng/releng-release-jobs.yaml
index 0c059ee9b..776f73f85 100644
--- a/jjb/releng/releng-release-jobs.yaml
+++ b/jjb/releng/releng-release-jobs.yaml
@@ -14,6 +14,23 @@
 
     stream:
       - 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'
@@ -64,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
@@ -75,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
+            - opnfv-build
           allowed-multiselect: false
           ignore-offline-nodes: true
       - stream-parameter:
@@ -85,11 +102,11 @@
       - project-parameter:
           project: '{project}'
           branch: 'master'
-      # Override GIT_BASE so we can send patches back to Gerrit and
+      # Override GIT_URL so we can send patches back to Gerrit and
       # modify repos
       - string:
-          name: GIT_BASE
-          default: ssh://$USER@gerrit.opnfv.org:29418/$PROJECT
+          name: GIT_URL
+          default: ssh://$USER@gerrit.opnfv.org:29418/
           description: 'Git URL to use on this Jenkins Slave'
 
     scm:
@@ -104,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