Merge "Fix ubuntu image creation issue"

[releng/builder.git] / jjb / releng-jobs.yaml

diff --git a/jjb/releng-jobs.yaml b/jjb/releng-jobs.yaml
index bc556cf82a015bfe0c4d2c90f0e1264063caa328..a74855eeefaf92c32346ae6f63048ecb8bf8f36e 100644 (file)
--- a/jjb/releng-jobs.yaml
+++ b/jjb/releng-jobs.yaml
@@ -47,6 +47,10 @@
           templates: devstack-pre-pip-mitaka
         - platforms: ubuntu-14.04
           templates: devstack-pre-pip-newton
+        - platforms: ubuntu-14.04
+          templates: devstack
+        - platforms: ubuntu-14.04
+          templates: docker
 
     project-type: freestyle
     archive-artifacts: '**/*.log'
@@ -58,7 +62,7 @@
 
 - job-template:
     name: builder-verify-jjb
-    node: jjbuilder
+    node: centos7-java-builder-2c-4g
 
     project-type: freestyle
 
@@ -90,11 +94,15 @@
             files: 'jjb/**'
 
     builders:
+        - opendaylight-infra-jjbini
         - shell: |
+            virtualenv $WORKSPACE/venv
+            source $WORKSPACE/venv/bin/activate
+            pip install --upgrade pip
             pip freeze
+            pip install jenkins-job-builder
             jenkins-jobs -l DEBUG test --recursive -o archives/job_output jjb/
             gzip archives/job_output/*
-
         - releng-check-unicode
         - verify-gpg-signature
 
@@ -159,7 +167,7 @@
 
 - job-template:
     name: 'builder-merge'
-    node: jjbuilder
+    node: centos7-java-builder-2c-4g
 
     # builder-merge job to run JJB update
     #
@@ -205,8 +213,13 @@
                       pattern: jjb/**
 
     builders:
+        - opendaylight-infra-jjbini
         - shell: |
+            virtualenv $WORKSPACE/venv
+            source $WORKSPACE/venv/bin/activate
+            pip install --upgrade pip
             pip freeze
+            pip install jenkins-job-builder
             jenkins-jobs --version
             jenkins-jobs update --recursive --delete-old --workers 4 jjb/
 
@@ -220,7 +233,7 @@
 - job-template:
     name: 'builder-weekly'
     disabled: false
-    node: jjbuilder
+    node: centos7-java-builder-2c-4g
 
     # builder-weekly job to run JJB update weekly
     #
@@ -252,7 +265,13 @@
         - timed: 'H H * * 0'
 
     builders:
+        - opendaylight-infra-jjbini
         - shell: |
+            virtualenv $WORKSPACE/venv
+            source $WORKSPACE/venv/bin/activate
+            pip install --upgrade pip
+            pip freeze
+            pip install jenkins-job-builder
             jenkins-jobs --flush-cache update --recursive --workers 4 jjb/
 
     publishers:
@@ -434,7 +453,9 @@
 
     scm:
         - gerrit-trigger-scm:
-            refspec: ''
+            refspec: '$GERRIT_REFSPEC'
+            branches:
+                - '$GERRIT_BRANCH'
             choosing-strategy: 'default'
 
     wrappers:
@@ -457,7 +478,19 @@
                       branch-pattern: '**/{branch}'
                 file-paths:
                     - compare-type: ANT
-                      pattern: 'packer/**'
+                      pattern: 'packer/vars/{platforms}.json'
+                    - compare-type: ANT
+                      pattern: 'packer/templates/{templates}.json'
+                    - compare-type: ANT
+                      pattern: 'packer/provision/{templates}.sh'
+                    - compare-type: ANT
+                      pattern: 'packer/provision/system_reseal.sh'
+                    - compare-type: ANT
+                      pattern: 'packer/provision/rh-user_data.sh'
+                    - compare-type: ANT
+                      pattern: 'packer/provision/devstack-pre-pip.sh'
+                    - compare-type: ANT
+                      pattern: 'packer/provision/baseline.sh'
 
     builders:
         - packer-validate: