From f614c437d08f9ca32b8a2a09c1e989104782e35b Mon Sep 17 00:00:00 2001 From: Trevor Bramwell Date: Tue, 27 Sep 2016 13:27:57 -0700 Subject: Rework Jenkins Sandbox - Instead of using 'sandbox' branch, use a seperate jjb tree. - Jobs under 'jjb-sandbox' are uploaded to the sandbox server, and can be re-uploaded with a 'redeploy' comment. - All jobs, with the exception of the releng sandbox jobs, on the sandbox server are removed once a week. JIRA: RELENG-91 Change-Id: Idfaf33b547158280378ecc63aa41db1b806f4c5f Signed-off-by: Trevor Bramwell --- jjb/releng/releng-ci-jobs.yml | 50 ------------------------------------------- 1 file changed, 50 deletions(-) (limited to 'jjb') diff --git a/jjb/releng/releng-ci-jobs.yml b/jjb/releng/releng-ci-jobs.yml index ac323a3c1..2d88449e8 100644 --- a/jjb/releng/releng-ci-jobs.yml +++ b/jjb/releng/releng-ci-jobs.yml @@ -2,7 +2,6 @@ name: builder-jobs jobs: - 'builder-verify-jjb' - - 'builder-sandbox' - 'builder-merge' - 'artifacts-api' @@ -101,55 +100,6 @@ git pull 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' -- cgit 1.2.3-korg