diff options
| -rw-r--r-- | jjb/apex/apex.yml | 1 | ||||
| -rw-r--r-- | jjb/releng/releng-ci-jobs.yml | 50 | ||||
| -rwxr-xr-x | utils/gpg_import_key.sh | 6 |
3 files changed, 54 insertions, 3 deletions
diff --git a/jjb/apex/apex.yml b/jjb/apex/apex.yml index 8f9f49e27..7566e2525 100644 --- a/jjb/apex/apex.yml +++ b/jjb/apex/apex.yml @@ -4,6 +4,7 @@ - 'apex-verify-{stream1}' - 'apex-verify-{stream2}' - 'apex-runner-{platform}-{scenario}-{stream}' + - 'apex-runner-cperf-{stream1}' - 'apex-build-{stream}' - 'apex-deploy-virtual-{scenario}-{stream}' - 'apex-deploy-baremetal-{scenario}-{stream}' diff --git a/jjb/releng/releng-ci-jobs.yml b/jjb/releng/releng-ci-jobs.yml index 60551f5bb..f346c1c5f 100644 --- a/jjb/releng/releng-ci-jobs.yml +++ b/jjb/releng/releng-ci-jobs.yml @@ -2,6 +2,7 @@ name: builder-jobs jobs: - 'builder-verify-jjb' + - 'builder-sandbox' - 'builder-merge' - 'artifacts-api' @@ -101,6 +102,55 @@ jenkins-jobs update --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' # Generate and upload the JSON file to used for artifacts site diff --git a/utils/gpg_import_key.sh b/utils/gpg_import_key.sh index bb11f0d45..f45e40919 100755 --- a/utils/gpg_import_key.sh +++ b/utils/gpg_import_key.sh @@ -37,12 +37,12 @@ fi if ! isinstalled gnupg2; then echo "error with install" - exit 1 + exit 0 fi if ! which gsutil; then echo "error gsutil not installed"; - exit 1 + exit 0 fi if gpg2 --list-keys | grep "opnfv-helpdesk@rt.linuxfoundation.org"; then @@ -50,7 +50,7 @@ if gpg2 --list-keys | grep "opnfv-helpdesk@rt.linuxfoundation.org"; then else if [ -z "$NODE_NAME" ]; then echo "Cannot find node name" - exit 1 + exit 0 else echo "Importing key for '$NODE_NAME'"; gsutil cp gs://opnfv-signing-keys/"$NODE_NAME"-subkey . gpg2 --import "$NODE_NAME"-subkey |