X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=jjb%2Freleng%2Freleng-release-jobs.yaml;h=d23779c0ebafa03ac3b489b7eec80b2eb65e7e0b;hb=734ce86924013edc21e9a845555a59feacf2c117;hp=e31320b81eed9281aeca680db73f30d4869e7426;hpb=afff1f88a918215eeb9060c4f43c5a332c8eb32c;p=releng.git

diff --git a/jjb/releng/releng-release-jobs.yaml b/jjb/releng/releng-release-jobs.yaml
index e31320b81..d23779c0e 100644
--- a/jjb/releng/releng-release-jobs.yaml
+++ b/jjb/releng/releng-release-jobs.yaml
@@ -10,8 +10,14 @@
 - project:
     name: releng-release-jobs
 
+    build-node: 'opnfv-build'
+
     stream:
       - fraser
+      - gambia
+      - hunter
+      - iruya
+      - jerma
 
     jobs:
       - 'releng-release-{stream}-verify'
@@ -23,6 +29,7 @@
     name: 'releng-release-{stream}-verify'
 
     parameters:
+      - '{build-node}-defaults'
       - stream-parameter:
           stream: '{stream}'
       - project-parameter:
@@ -59,9 +66,9 @@
                   pattern: 'releases/scripts/verify_schema.py'
 
     builders:
-      - create-virtualenv
-      - shell:
-          !include-raw-escape: releng-release-verify.sh
+      - shell: !include-raw-escape:
+          - releng-release-create-venv.sh
+          - branch-or-tag.sh
 
     publishers:
       - email-jenkins-admins-on-failure
@@ -82,6 +89,12 @@
       - project-parameter:
           project: '{project}'
           branch: 'master'
+      # Override GIT_URL so we can send patches back to Gerrit and
+      # modify repos
+      - string:
+          name: GIT_URL
+          default: ssh://$USER@gerrit.opnfv.org:29418/
+          description: 'Git URL to use on this Jenkins Slave'
 
     scm:
       - git-scm-gerrit
@@ -93,9 +106,9 @@
           files: 'releases/{stream}/*'
 
     builders:
-      - create-virtualenv
-      - shell:
-          !include-raw-escape: releng-release-create-branch.sh
+      - shell: !include-raw-escape:
+          - releng-release-create-venv.sh
+          - branch-or-tag.sh
 
     publishers:
       - email-jenkins-admins-on-failure
@@ -107,13 +120,3 @@
           name: STREAM
           default: '{stream}'
           description: "OPNFV Stable Stream"
-
-- builder:
-    name: create-virtualenv
-    builders:
-      - shell: |
-          #!/bin/bash
-          sudo pip install virtualenv
-          virtualenv $WORKSPACE/venv
-          . $WORKSPACE/venv/bin/activate
-          pip install --upgrade pip