diff options
Diffstat (limited to 'jjb')
| -rw-r--r-- | jjb/apex/apex.yml | 11 | ||||
| -rw-r--r-- | jjb/releng-jobs.yaml | 17 | ||||
| -rw-r--r-- | jjb/releng-macros.yaml | 22 |
3 files changed, 46 insertions, 4 deletions
diff --git a/jjb/apex/apex.yml b/jjb/apex/apex.yml index b304f2270..6f2f441af 100644 --- a/jjb/apex/apex.yml +++ b/jjb/apex/apex.yml @@ -15,7 +15,7 @@ branch: 'master' gs-pathname: '' block-stream: 'brahmaputra' - slave: 'opnfv-jump-1' + slave: 'intel-pod7' - brahmaputra: branch: 'stable/brahmaputra' gs-pathname: '/brahmaputra' @@ -167,7 +167,7 @@ - trigger-builds: - project: 'apex-deploy-{platform}-{scenario}-{stream}' predefined-parameters: - OPNFV_CLEAN='yes' + OPNFV_CLEAN=yes git-revision: false block: true - trigger-builds: @@ -229,8 +229,9 @@ - 'apex-build' - trigger-builds: - project: 'apex-deploy-virtual-os-odl_l2-nofeature-ha-{stream}' - predefined-parameters: + predefined-parameters: | BUILD_DIRECTORY=apex-build-{stream}/build_output + OPNFV_CLEAN=yes git-revision: false block: true - 'apex-upload-artifact' @@ -502,9 +503,11 @@ else export OPNFV_ARTIFACT_VERSION=${ARTIFACT_VERSION} fi + # clean for stable but doesn't matter for master + sudo opnfv-clean || echo "" # start the build cd $WORKSPACE/ci - ./build.sh -v $OPNFV_ARTIFACT_VERSION $BUILD_ARGS + ./build.sh $BUILD_ARGS RPM_VERSION=$(grep Version $BUILD_DIRECTORY/../build/opnfv-apex.spec | awk '{ print $2 }')-$(echo $OPNFV_ARTIFACT_VERSION | tr -d '_-') # list the contents of BUILD_OUTPUT directory ls -al $BUILD_DIRECTORY diff --git a/jjb/releng-jobs.yaml b/jjb/releng-jobs.yaml index 0b36f0775..655660bb9 100644 --- a/jjb/releng-jobs.yaml +++ b/jjb/releng-jobs.yaml @@ -3,6 +3,7 @@ jobs: - 'builder-verify-jjb' - 'builder-merge' + - 'artifacts-api' project: 'releng' @@ -99,3 +100,19 @@ git pull jenkins-jobs update --delete-old jjb/ +- job-template: + name: 'artifacts-api' + + # Generate and upload the JSON file to used for artifacts site + + parameters: + - project-parameter: + project: '{project}' + - gerrit-parameter: + branch: 'master' + + triggers: + - timed: '@hourly' + + builders: + - build-and-upload-artifacts-json-api diff --git a/jjb/releng-macros.yaml b/jjb/releng-macros.yaml index b43a76d5f..625e10a4d 100644 --- a/jjb/releng-macros.yaml +++ b/jjb/releng-macros.yaml @@ -299,6 +299,28 @@ fi - builder: + name: build-and-upload-artifacts-json-api + builders: + - shell: | + #!/bin/bash + set -o errexit + set -o pipefail + + echo "Generating Artifacts API ..." + virtualenv $WORKSPACE/releng_artifacts + source $WORKSPACE/releng_artifacts/bin/activate + + # install python packages + easy_install -U setuptools + pip install google-api-python-client + + # generate and upload index file + python ./releng/utils/opnfv-artifacts.py > index.json + gsutil cp index.json gs://artifacts.opnfv.org/index.json + + deactivate + +- builder: name: upload-review-docs builders: - build-html-and-pdf-docs-output |