Merge "Revert "Cleanup dirty daisy build workspace directory""

[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 f346c1c..ecc8730 100644 (file)
--- a/jjb/releng/releng-ci-jobs.yml
+++ b/jjb/releng/releng-ci-jobs.yml
@@ -1,29 +1,25 @@
 - 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-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'
@@ -58,7 +54,7 @@
             artifacts: 'job_output/*'
 
 - job-template:
-    name: 'builder-merge'
+    name: 'releng-merge-jjb'
 
     # builder-merge job to run JJB update
     #
@@ -67,17 +63,14 @@
     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:
@@ -99,73 +92,20 @@
                 source /opt/virtualenv/jenkins-job-builder/bin/activate
                 cd /opt/jenkins-ci/releng
                 git pull
-                jenkins-jobs update --delete-old jjb/
+                jenkins-jobs update -r --delete-old jjb/
 
 - job-template:
-    name: 'builder-sandbox'
-
-    # Upload all jjb jobs to sandbox instance, excluding jobs jjb
-    # builder jobs
-
-    parameters:
-        - project-parameter:
-            project: '{project}'
-        - gerrit-parameter:
-            branch: 'master'
-
-    scm:
-        - gerrit-trigger-scm:
-            credentials-id: '{ssh-credentials}'
-            refspec: ''
-            choosing-strategy: 'default'
-
-    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: '**/sandbox'
-                file-paths:
-                    - compare-type: ANT
-                      pattern: jjb/**
-                    - compare-type: ANT
-                      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
-
-- 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'