Merge "Fix for when requiretty is disabled with a !"

[releng.git] / jjb / releng / releng-ci-jobs.yml

diff --git a/jjb/releng/releng-ci-jobs.yml b/jjb/releng/releng-ci-jobs.yml
index ac323a3..fd58ef2 100644 (file)
--- a/jjb/releng/releng-ci-jobs.yml
+++ b/jjb/releng/releng-ci-jobs.yml
@@ -1,29 +1,26 @@
 - project:
-    name: builder-jobs
+    name: releng-builder-jobs
     jobs:
-        - 'builder-verify-jjb'
-        - 'builder-sandbox'
-        - 'builder-merge'
-        - 'artifacts-api'
+        - 'releng-verify-jjb'
+        - 'releng-merge-jjb'
+        - 'releng-comment-jjb'
+        - 'releng-generate-artifacts-api'
 
     project: 'releng'
 
 - job-template:
-    name: builder-verify-jjb
+    name: releng-verify-jjb
 
     parameters:
         - project-parameter:
             project: '{project}'
-        - gerrit-parameter:
             branch: 'master'
     scm:
-        - gerrit-trigger-scm:
-            credentials-id: '{ssh-credentials}'
-            refspec: '$GERRIT_REFSPEC'
-            choosing-strategy: 'gerrit'
+        - git-scm-gerrit
 
     triggers:
         - gerrit:
+            server-name: 'gerrit.opnfv.org'
             trigger-on:
                 - patchset-created-event:
                     exclude-drafts: 'false'
@@ -56,71 +53,47 @@
     publishers:
         - archive-artifacts:
             artifacts: 'job_output/*'
+        - email-jenkins-admins-on-failure
 
 - job-template:
-    name: 'builder-merge'
-
-    # builder-merge job to run JJB update
-    #
-    # This job's purpose is to update all the JJB
+    name: releng-comment-jjb
 
     parameters:
         - project-parameter:
             project: '{project}'
-        - gerrit-parameter:
             branch: 'master'
-
     scm:
-        - gerrit-trigger-scm:
-            credentials-id: '{ssh-credentials}'
-            refspec: ''
-            choosing-strategy: 'default'
+        - git-scm-gerrit
 
     triggers:
-        - gerrit:
-            trigger-on:
-                - change-merged-event
-                - comment-added-contains-event:
-                    comment-contains-value: 'remerge'
-            projects:
-              - project-compare-type: 'ANT'
-                project-pattern: 'releng'
-                branches:
-                    - branch-compare-type: 'ANT'
-                      branch-pattern: '**/master'
-                file-paths:
-                    - compare-type: ANT
-                      pattern: jjb/**
-                    - compare-type: ANT
-                      pattern: utils/**
+        - experimental:
+            project: '{project}'
+            branch: 'master'
+            files: 'jjb/**'
 
     builders:
-        - shell: |
-                source /opt/virtualenv/jenkins-job-builder/bin/activate
-                cd /opt/jenkins-ci/releng
-                git pull
-                jenkins-jobs update -r --delete-old jjb/
+        - shell:
+            !include-raw-escape: generate-job-list.sh
+        - report-build-result-to-gerrit
 
 - job-template:
-    name: 'builder-sandbox'
+    name: 'releng-merge-jjb'
 
-    # Upload all jjb jobs to sandbox instance, excluding jobs jjb
-    # builder jobs
+    # builder-merge job to run JJB update
+    #
+    # This job's purpose is to update all the JJB
 
     parameters:
         - project-parameter:
             project: '{project}'
-        - gerrit-parameter:
             branch: 'master'
 
     scm:
-        - gerrit-trigger-scm:
-            credentials-id: '{ssh-credentials}'
-            refspec: ''
-            choosing-strategy: 'default'
+        - git-scm
 
     triggers:
         - gerrit:
+            server-name: 'gerrit.opnfv.org'
             trigger-on:
                 - change-merged-event
                 - comment-added-contains-event:
@@ -130,7 +103,7 @@
                 project-pattern: 'releng'
                 branches:
                     - branch-compare-type: 'ANT'
-                      branch-pattern: '**/sandbox'
+                      branch-pattern: '**/master'
                 file-paths:
                     - compare-type: ANT
                       pattern: jjb/**
@@ -138,34 +111,24 @@
                       pattern: utils/**
 
     builders:
-        - shell:
-            !include-raw: verify-releng.sh
         - shell: |
-                #!/bin/bash
                 source /opt/virtualenv/jenkins-job-builder/bin/activate
                 cd /opt/jenkins-ci/releng
                 git pull
-                cp /etc/jenkins_jobs/jenkins_jobs.ini jenkins_sandbox.ini
-                sed -i 's/url=.*/url=https:\/\/sandbox.opnfv.org\//g' jenkins_sandbox.ini
-                jenkins-jobs --conf jenkins_sandbox.ini update -r -x jjb/releng --delete-old jjb
-                rm -f jenkins_sandbox.ini
+                jenkins-jobs update -r --delete-old jjb/
 
 - job-template:
-    name: 'artifacts-api'
+    name: 'releng-generate-artifacts-api'
 
     # Generate and upload the JSON file to used for artifacts site
 
     parameters:
         - project-parameter:
             project: '{project}'
-        - gerrit-parameter:
             branch: 'master'
 
     scm:
-        - gerrit-trigger-scm:
-            credentials-id: '{ssh-credentials}'
-            refspec: ''
-            choosing-strategy: 'default'
+        - git-scm
 
     triggers:
         - timed: '@hourly'