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 <thanh.ha@linuxfoundation.org>

diff --git a/jjb/autorelease/autorelease-macros.yaml b/jjb/autorelease/autorelease-macros.yaml
index 2689a5a7e3c028421ac4775803f72ef1ea5d182c..903332e806d38e6ae811dab4678b686e120b561c 100644 (file)
--- 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 aa205517366205dd017d0801bd0cfe104e742c1a..edf56a1e9ce91d936388621ecfc850162aabfebd 160000 (submodule)
--- 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 fbaafd57a72a6b846d0f95e374a9fc4e19b34d4a..0924a876be2228f954e151200e52d20f015d08b0 100644 (file)
--- 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 62a110906d369ef8a3c90ada4d0a50548df215f3..f0af74ad67c545724b24a7a488a95551ed1aebf3 100644 (file)
--- 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 60a686d748729a16bf1f005938a1a5b9088b0641..89508caf615bbf451bf6c8c8fc5a7ae2e7b1e904 100644 (file)
--- 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