diff options
Diffstat (limited to 'jjb')
| -rwxr-xr-x | jjb/kvmfornfv/kvmfornfv-download-artifact.sh | 6 | ||||
| -rwxr-xr-x | jjb/kvmfornfv/kvmfornfv-test.sh | 22 | ||||
| -rw-r--r-- | jjb/kvmfornfv/kvmfornfv.yml | 77 |
3 files changed, 98 insertions, 7 deletions
diff --git a/jjb/kvmfornfv/kvmfornfv-download-artifact.sh b/jjb/kvmfornfv/kvmfornfv-download-artifact.sh index 1f99f177b..c8bdb9c72 100755 --- a/jjb/kvmfornfv/kvmfornfv-download-artifact.sh +++ b/jjb/kvmfornfv/kvmfornfv-download-artifact.sh @@ -16,6 +16,12 @@ case "$JOB_TYPE" in echo "Downloading artifacts for the change $GERRIT_CHANGE_NUMBER. This could take some time..." GS_UPLOAD_LOCATION="gs://artifacts.opnfv.org/$PROJECT/review/$GERRIT_CHANGE_NUMBER" ;; + daily) + gsutil cp gs://$GS_URL/latest.properties $WORKSPACE/latest.properties + source $WORKSPACE/latest.properties + GS_UPLOAD_LOCATION=$OPNFV_ARTIFACT_URL + echo "Downloading artifacts from $GS_UPLOAD_LOCATION for daily run. This could take some time..." + ;; *) echo "Artifact download is not enabled for $JOB_TYPE jobs" exit 1 diff --git a/jjb/kvmfornfv/kvmfornfv-test.sh b/jjb/kvmfornfv/kvmfornfv-test.sh index 868de13bd..06377ac4f 100755 --- a/jjb/kvmfornfv/kvmfornfv-test.sh +++ b/jjb/kvmfornfv/kvmfornfv-test.sh @@ -3,8 +3,24 @@ ##This script includes executing cyclictest scripts. ########################################################## #The latest build packages are stored in build_output + ls -al $WORKSPACE/build_output -#start the test -cd $WORKSPACE -./ci/test_kvmfornfv.sh +if [[ "$JOB_NAME" =~ (verify|merge|daily|weekly) ]]; then + JOB_TYPE=${BASH_REMATCH[0]} +else + echo "Unable to determine job type!" + exit 1 +fi + +# do stuff differently based on the job type +case "$JOB_TYPE" in + verify|daily) + #start the test + cd $WORKSPACE + ./ci/test_kvmfornfv.sh $JOB_TYPE + ;; + *) + echo "Test is not enabled for $JOB_TYPE jobs" + exit 1 +esac diff --git a/jjb/kvmfornfv/kvmfornfv.yml b/jjb/kvmfornfv/kvmfornfv.yml index 4bb0a15b4..b6a55fe6a 100644 --- a/jjb/kvmfornfv/kvmfornfv.yml +++ b/jjb/kvmfornfv/kvmfornfv.yml @@ -28,6 +28,7 @@ - 'kvmfornfv-verify-{phase}-{stream}' - 'kvmfornfv-merge-{stream}' - 'kvmfornfv-daily-{stream}' + - 'kvmfornfv-daily-{phase}-{stream}' ##################################### # job templates ##################################### @@ -201,10 +202,63 @@ - timed: '@midnight' builders: - - shell: - !include-raw-escape: ./kvmfornfv-build.sh - - shell: - !include-raw-escape: ./kvmfornfv-upload-artifact.sh + - description-setter: + description: "Built on $NODE_NAME" + - multijob: + name: build + condition: SUCCESSFUL + projects: + - name: 'kvmfornfv-daily-build-{stream}' + current-parameters: false + node-parameters: false + git-revision: true + kill-phase-on: FAILURE + abort-all-job: true + - multijob: + name: test + condition: SUCCESSFUL + projects: + - name: 'kvmfornfv-daily-test-{stream}' + current-parameters: false + node-parameters: false + git-revision: true + kill-phase-on: FAILURE + abort-all-job: true + + +- job-template: + name: 'kvmfornfv-daily-{phase}-{stream}' + + disabled: '{obj:disabled}' + + concurrent: false + + scm: + - gerrit-trigger-scm: + credentials-id: '{ssh-credentials}' + refspec: '' + choosing-strategy: 'default' + + wrappers: + - ssh-agent-credentials: + users: + - '{ssh-credentials}' + - timeout: + timeout: 360 + fail: true + parameters: + - project-parameter: + project: '{project}' + - gerrit-parameter: + branch: '{branch}' + - '{slave-label}-defaults' + - 'kvmfornfv-defaults': + gs-pathname: '{gs-pathname}' + + builders: + - description-setter: + description: "Built on $NODE_NAME" + - '{project}-daily-{phase}-macro' ##################################### # builder macros ##################################### @@ -222,6 +276,21 @@ !include-raw: ./kvmfornfv-download-artifact.sh - shell: !include-raw: ./kvmfornfv-test.sh +- builder: + name: 'kvmfornfv-daily-build-macro' + builders: + - shell: + !include-raw: ./kvmfornfv-build.sh + - shell: + !include-raw: ./kvmfornfv-upload-artifact.sh +- builder: + name: 'kvmfornfv-daily-test-macro' + builders: + - shell: + !include-raw: ./kvmfornfv-download-artifact.sh + - shell: + !include-raw: ./kvmfornfv-test.sh + ##################################### # parameter macros ##################################### |