Merge "jjb/releng: fix compass-container $DOCKERFILE"

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

diff --git a/jjb-sandbox/releng/releng-sandbox-jobs.yml b/jjb-sandbox/releng/releng-sandbox-jobs.yml
index ee35f42..df8b1d5 100644 (file)
--- a/jjb-sandbox/releng/releng-sandbox-jobs.yml
+++ b/jjb-sandbox/releng/releng-sandbox-jobs.yml
@@ -1,77 +1,61 @@
+---
 - project:
     name: 'releng-sandbox-jobs'
     jobs:
-        - 'releng-deploy-sandbox'
-        - 'releng-clear-jenkins-jobs'
+      - 'releng-deploy-sandbox'
 
     project: 'releng'
+    node: 'releng-sandbox'
 
 - job-template:
     name: 'releng-deploy-sandbox'
+    node: '{node}'
 
     parameters:
-        - project-parameter:
-            project: '{project}'
-        - gerrit-parameter:
-            branch: 'master'
+      - project-parameter:
+          project: '{project}'
+          branch: 'master'
     scm:
-        - gerrit-trigger-scm:
-            credentials-id: '{ssh-credentials}'
-            refspec: '$GERRIT_REFSPEC'
-            choosing-strategy: 'gerrit'
+      - git-scm-gerrit
 
     triggers:
-        - gerrit:
-            trigger-on:
-                - patchset-created-event:
-                    exclude-drafts: 'false'
-                    exclude-trivial-rebase: 'false'
-                    exclude-no-code-change: 'false'
-                - draft-published-event
-                - comment-added-contains-event:
-                    comment-contains-value: 'redeploy'
-            projects:
-              - project-compare-type: 'ANT'
-                project-pattern: 'releng'
-                branches:
-                  - branch-compare-type: 'ANT'
-                    branch-pattern: '**/master'
-                file-paths:
-                    - compare-type: ANT
-                      pattern: jjb-sandbox/**
-                    - compare-type: ANT
-                      pattern: utils/**
+      - gerrit:
+          trigger-on:
+            - patchset-created-event:
+                exclude-drafts: 'false'
+                exclude-trivial-rebase: 'false'
+                exclude-no-code-change: 'false'
+            - draft-published-event
+            - comment-added-contains-event:
+                comment-contains-value: 'redeploy'
+          custom-url: '$BUILD_URL deploying to $JENKINS_URL'
+          silent-start: true
+          skip-vote:
+            successful: true
+            failed: true
+            unstable: true
+            notbuilt: true
+          projects:
+            - project-compare-type: 'ANT'
+              project-pattern: 'releng'
+              branches:
+                - branch-compare-type: 'ANT'
+                  branch-pattern: '**/master'
+              file-paths:
+                - compare-type: ANT
+                  pattern: jjb-sandbox/**
+
+    wrappers: ''
 
     builders:
-        - shell:
-            !include-raw-escape: verify-sandbox-jobs.sh
-        - shell: |
-            #! /bin/bash
-            jenkins-jobs update -r jjb-sandbox
-
+      - shell:
+          !include-raw-escape: verify-sandbox-jobs.sh
+      # yamllint disable rule:line-length
+      - shell: |
+          #!/bin/bash
+          jenkins-jobs update --delete-old -r jjb/releng-defaults.yaml:jjb/releng-macros.yaml:jjb/opnfv/installer-params.yml:jjb/opnfv/slave-params.yml:jjb-sandbox
+      # yamllint enable
     publishers:
-        - archive-artifacts:
-            artifacts: 'job_output/*'
-
-- job-template:
-    name: 'releng-clear-jenkins-jobs'
-
-    parameters:
-        - project-parameter:
-            project: '{project}'
-        - gerrit-parameter:
-            branch: 'master'
-
-    scm:
-        - gerrit-trigger-scm:
-            credentials-id: '{ssh-credentials}'
-            refspec: ''
-            choosing-strategy: 'default'
-
-    triggers:
-        - timed: '@weekly'
-
-    builders:
-        - shell: |
-            #! /bin/bash
-            jenkins-jobs delete -r -p jjb-sandbox -x jjb-sandbox/releng
+      - archive-artifacts:
+          artifacts: 'job_output/*'
+      - email-jenkins-admins-on-failure