From: Trevor Bramwell <tbramwell@linuxfoundation.org>
Date: Mon, 3 Oct 2016 20:36:16 +0000 (-0700)
Subject: Update JJB Sandbox
X-Git-Tag: danube.1.0~719^2
X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=commitdiff_plain;h=77fb5f95755425aaff51c84db82b4eb5bc45afeb;p=releng.git

Update JJB Sandbox

- Build status message includes a link back to the sandbox
- The deploy job now includes references to required macros (similar to
  'verify')
- Wrappers are removed by setting 'wrappers' to the empty string. This
  is due to the 'ssh-agent' credentials not being used nor existing on
  the sandbox server.
- Shebang lines have been fixed to remove the space after '#!' causing
  the Java 'Cannot run program' error.
- Jobs are restricted to the 'releng-sandbox' label so they aren't
  triggered on 'master'
- Remove 'utils' directory from triggering builds.
- Sandbox deployment doesn't vote on any builds, this should help should
  the job again somehow run against non-sandbox changes.
- 'releng-clear-sandbox-jobs' replaced with '--delete-old' on update so
  that each patchset submitted will remove any previously deployed jobs.

Change-Id: I4f37dbb0c0becc5760c826950306e9d958a40aaa
Signed-off-by: Trevor Bramwell <tbramwell@linuxfoundation.org>
---

diff --git a/jjb-sandbox/releng/releng-sandbox-jobs.yml b/jjb-sandbox/releng/releng-sandbox-jobs.yml
index ee35f4299..aa10a4327 100644
--- a/jjb-sandbox/releng/releng-sandbox-jobs.yml
+++ b/jjb-sandbox/releng/releng-sandbox-jobs.yml
@@ -2,12 +2,13 @@
     name: 'releng-sandbox-jobs'
     jobs:
         - 'releng-deploy-sandbox'
-        - 'releng-clear-jenkins-jobs'
 
     project: 'releng'
+    node: 'releng-sandbox'
 
 - job-template:
     name: 'releng-deploy-sandbox'
+    node: '{node}'
 
     parameters:
         - project-parameter:
@@ -30,6 +31,13 @@
                 - 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'
@@ -39,39 +47,16 @@
                 file-paths:
                     - compare-type: ANT
                       pattern: jjb-sandbox/**
-                    - compare-type: ANT
-                      pattern: utils/**
+
+    wrappers: ''
 
     builders:
         - shell:
             !include-raw-escape: verify-sandbox-jobs.sh
         - shell: |
-            #! /bin/bash
-            jenkins-jobs update -r jjb-sandbox
+            #!/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
 
     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
diff --git a/jjb-sandbox/releng/verify-sandbox-jobs.sh b/jjb-sandbox/releng/verify-sandbox-jobs.sh
index 8f67e742b..599016106 100755
--- a/jjb-sandbox/releng/verify-sandbox-jobs.sh
+++ b/jjb-sandbox/releng/verify-sandbox-jobs.sh
@@ -1,4 +1,4 @@
-#! /bin/bash
+#!/bin/bash
 # SPDX-license-identifier: Apache-2.0
 ##############################################################################
 # Copyright (c) 2016 Linux Foundation and others.