From 10ec6fe1fd87f1f7fdcd5ed02ed3e4e39fbf253d Mon Sep 17 00:00:00 2001 From: Thanh Ha Date: Tue, 3 Apr 2018 10:44:20 -0400 Subject: [PATCH] Pull in tox<3.0.0 pin fix Latest tox 3.0.0 is breaking all tox jobs so pin it to an older working version. This also pulls in a patch that requires an update to PostBuildScript 2.x. This also updates jjb to 2.0.3 as the latest global-jjb needs it. Change-Id: I480d53af9f5750f8a9c30b2cece15ddb33bc622e Signed-off-by: Thanh Ha --- jjb/autorelease/autorelease-macros.yaml | 13 +++- jjb/global-jjb | 2 +- jjb/integration/integration-macros.yaml | 84 ++++++++++++++----------- jjb/releng-jobs.yaml | 2 +- jjb/releng-macros.yaml | 14 +++-- 5 files changed, 71 insertions(+), 44 deletions(-) diff --git a/jjb/autorelease/autorelease-macros.yaml b/jjb/autorelease/autorelease-macros.yaml index 2689a5a7e..903332e80 100644 --- a/jjb/autorelease/autorelease-macros.yaml +++ b/jjb/autorelease/autorelease-macros.yaml @@ -162,6 +162,13 @@ publishers: - postbuildscript: builders: - - shell: !include-raw: notify-build-failure.sh - script-only-if-succeeded: false - script-only-if-failed: true + - role: BOTH + build-on: + - ABORTED + - FAILURE + - NOT_BUILT + - SUCCESS + - UNSTABLE + build-steps: + - shell: !include-raw: notify-build-failure.sh + mark-unstable-if-failed: true diff --git a/jjb/global-jjb b/jjb/global-jjb index aa2055173..edf56a1e9 160000 --- a/jjb/global-jjb +++ b/jjb/global-jjb @@ -1 +1 @@ -Subproject commit aa205517366205dd017d0801bd0cfe104e742c1a +Subproject commit edf56a1e9ce91d936388621ecfc850162aabfebd diff --git a/jjb/integration/integration-macros.yaml b/jjb/integration/integration-macros.yaml index fbaafd57a..0924a876b 100644 --- a/jjb/integration/integration-macros.yaml +++ b/jjb/integration/integration-macros.yaml @@ -522,44 +522,58 @@ publishers: - postbuildscript: builders: - - shell: | - #!/bin/bash - cd $WORKSPACE - mkdir -p ./archives - curl --output robot-plugin.zip "$BUILD_URL/robot/report/*zip*/robot-plugin.zip" - unzip -d ./archives robot-plugin.zip - mv *.log *.log.gz *.csv *.png ./archives || true # Don't fail if file missing - # TODO: Can the following line ever fail? - find . -type f -name *.hprof -print0 | tar -cvf - --null -T - | xz --threads=0 > ./archives/hprof.tar.xz - # TODO: Tweak the compression level if better ratio (or speed) is needed. - script-only-if-succeeded: 'False' - script-only-if-failed: 'False' - mark-unstable-if-failed: 'True' + - role: BOTH + build-on: + - ABORTED + - FAILURE + - NOT_BUILT + - SUCCESS + - UNSTABLE + build-steps: + - shell: | + #!/bin/bash + cd $WORKSPACE + mkdir -p ./archives + curl --output robot-plugin.zip "$BUILD_URL/robot/report/*zip*/robot-plugin.zip" + unzip -d ./archives robot-plugin.zip + mv *.log *.log.gz *.csv *.png ./archives || true # Don't fail if file missing + # TODO: Can the following line ever fail? + find . -type f -name *.hprof -print0 \ + | tar -cvf - --null -T - | xz --threads=0 > ./archives/hprof.tar.xz + # TODO: Tweak the compression level if better ratio (or speed) is needed. + mark-unstable-if-failed: true + - publisher: name: integration-csit-run-postscript publishers: - postbuildscript: builders: - - config-file-provider: - files: - - file-id: 'odl-elastic-cloud' - target: '${HOME}/.netrc' - - shell: | - #!/bin/bash - #The following script runs any configurable postplan stored in test/csit/postplans. - if [ -f "${WORKSPACE}/test/csit/postplans/${TESTPLAN}" ]; then - echo "postplan exists!!!" - echo "Changing the postplan path..." - script_name=${WORKSPACE}/test/csit/postplans/${TESTPLAN} - cat ${script_name} | sed "s:integration:${WORKSPACE}:" > postplan.txt - cat postplan.txt - egrep -v '(^[[:space:]]*#|^[[:space:]]*$)' postplan.txt | while read -r line ; do - echo "Executing ${line}..." - ${line} - done - fi - rm ${HOME}/.netrc - script-only-if-succeeded: 'False' - script-only-if-failed: 'False' - mark-unstable-if-failed: 'True' + - role: BOTH + build-on: + - ABORTED + - FAILURE + - NOT_BUILT + - SUCCESS + - UNSTABLE + build-steps: + - config-file-provider: + files: + - file-id: 'odl-elastic-cloud' + target: '${HOME}/.netrc' + - shell: | + #!/bin/bash + #The following script runs any configurable postplan stored in test/csit/postplans. + if [ -f "${WORKSPACE}/test/csit/postplans/${TESTPLAN}" ]; then + echo "postplan exists!!!" + echo "Changing the postplan path..." + script_name=${WORKSPACE}/test/csit/postplans/${TESTPLAN} + cat ${script_name} | sed "s:integration:${WORKSPACE}:" > postplan.txt + cat postplan.txt + egrep -v '(^[[:space:]]*#|^[[:space:]]*$)' postplan.txt | while read -r line ; do + echo "Executing ${line}..." + ${line} + done + fi + rm ${HOME}/.netrc + mark-unstable-if-failed: true diff --git a/jjb/releng-jobs.yaml b/jjb/releng-jobs.yaml index 62a110906..f0af74ad6 100644 --- a/jjb/releng-jobs.yaml +++ b/jjb/releng-jobs.yaml @@ -28,7 +28,7 @@ build-node: centos7-builder-2c-2g archive-artifacts: '**/*.log' build-timeout: 30 - jjb-version: 2.0.0 + jjb-version: 2.0.3 jenkins-urls: > https://jenkins.opendaylight.org/releng https://jenkins.opendaylight.org/sandbox diff --git a/jjb/releng-macros.yaml b/jjb/releng-macros.yaml index 60a686d74..89508caf6 100644 --- a/jjb/releng-macros.yaml +++ b/jjb/releng-macros.yaml @@ -485,7 +485,13 @@ publishers: - postbuildscript: builders: - - shell: !include-raw: generate-csit-status-report.sh - script-only-if-succeeded: false - script-only-if-failed: false - mark-unstable-if-failed: false + - role: BOTH + build-on: + - ABORTED + - FAILURE + - NOT_BUILT + - SUCCESS + - UNSTABLE + build-steps: + - shell: !include-raw: generate-csit-status-report.sh + mark-unstable-if-failed: true -- 2.36.6