diff options
| -rw-r--r-- | jjb-sandbox/releng/releng-sandbox-jobs.yml | 41 | ||||
| -rwxr-xr-x | jjb-sandbox/releng/verify-sandbox-jobs.sh | 2 | ||||
| -rw-r--r-- | jjb/dovetail/dovetail-ci-jobs.yml | 21 |
3 files changed, 35 insertions, 29 deletions
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. diff --git a/jjb/dovetail/dovetail-ci-jobs.yml b/jjb/dovetail/dovetail-ci-jobs.yml index 1dd1795cb..29212005d 100644 --- a/jjb/dovetail/dovetail-ci-jobs.yml +++ b/jjb/dovetail/dovetail-ci-jobs.yml @@ -81,6 +81,27 @@ SUT: compass auto-trigger-name: 'daily-trigger-disabled' <<: *colorado +#apex CI PODs + - apex-verify-master: + slave-label: '{pod}' + SUT: apex + auto-trigger-name: 'daily-trigger-disabled' + <<: *master + - apex-daily-master: + slave-label: '{pod}' + SUT: apex + auto-trigger-name: 'daily-trigger-disabled' + <<: *master + - apex-verify-colorado: + slave-label: '{pod}' + SUT: apex + auto-trigger-name: 'daily-trigger-disabled' + <<: *colorado + - apex-daily-colorado: + slave-label: '{pod}' + SUT: apex + auto-trigger-name: 'daily-trigger-disabled' + <<: *colorado #-------------------------------- # None-CI PODs #-------------------------------- |