Revert "Feat!: Upgrade Jenkins-job-builder to 6x"

This reverts commit cbe4988f0e9e9668919c0dd5cdd03d1e925ce93f.

Reason for revert: the change in jjb/global_macros.yaml replacing !include-raw with !include-raw-escape mangles the python code in the here_doc that gets written to /w/workspace/publish_library.py, thus all jobs fail during post job upload of log files to AWS s3 storage.

Change-Id: I8346ed9db9810f595614c28c114cc08170fdeb1a
Signed-off-by: Dave Wallace <dwallacelf@gmail.com>

diff --git a/extras/bash/sandbox_test_functions.sh b/extras/bash/sandbox_test_functions.sh
index a08e594..c414567 100644 (file)
--- a/extras/bash/sandbox_test_functions.sh
+++ b/extras/bash/sandbox_test_functions.sh
@@ -29,7 +29,7 @@
 
 jjb-sandbox-env()
 {
-    local jjb_version=${JJB_VERSION:-"6.0.0"}
+    local jjb_version=${JJB_VERSION:-"5.0.2"}
 
     if [ -z "$WS_ROOT" ] ; then
         echo "ERROR: WS_ROOT is not set!"

diff --git a/global-jjb b/global-jjb
index b9d610a..766dbef 160000 (submodule)
--- a/global-jjb
+++ b/global-jjb
@@ -1 +1 @@
-Subproject commit b9d610a9e522d71a89d2daeb6f71b2bc2a71cdf7
+Subproject commit 766dbef8a63d824d6e551d4f179806521be95d13

diff --git a/jjb/ci-management/ci-management-jobs.yaml b/jjb/ci-management/ci-management-jobs.yaml
index 3380eda..58f4d4c 100644 (file)
--- a/jjb/ci-management/ci-management-jobs.yaml
+++ b/jjb/ci-management/ci-management-jobs.yaml
@@ -14,7 +14,7 @@
     project-name: ci-management
     build-node: centos8-builder-2c-2g
     build-timeout: 15
-    jjb-version: 6.0.0
+    jjb-version: 5.0.2
 
 - project:
     name: ci-management

diff --git a/jjb/csit/csit-perf.yaml b/jjb/csit/csit-perf.yaml
index 76c5090..78dd9fd 100644 (file)
--- a/jjb/csit/csit-perf.yaml
+++ b/jjb/csit/csit-perf.yaml
@@ -595,8 +595,7 @@
           project: '{project}'
       - gerrit-parameter:
           branch: '{branch}'
-      - gerrit-refspec-parameter:
-          refspec: '$GERRIT_REFSPEC'
+      - gerrit-refspec-parameter
       - gerrit-event-type-parameter
       - gerrit-event-comment-text-parameter
       - csit-perf-trial-duration-parameter:
@@ -980,8 +979,7 @@
           project: '{project}'
       - gerrit-parameter:
           branch: '{branch}'
-      - gerrit-refspec-parameter:
-          refspec: '$GERRIT_REFSPEC'
+      - gerrit-refspec-parameter
       - gerrit-event-type-parameter
       - gerrit-event-comment-text-parameter
       - csit-perf-trial-duration-parameter:
@@ -1069,8 +1067,7 @@
           project: '{project}'
       - gerrit-parameter:
           branch: '{branch}'
-      - gerrit-refspec-parameter:
-          refspec: '$GERRIT_REFSPEC'
+      - gerrit-refspec-parameter
       - gerrit-event-type-parameter
       - gerrit-event-comment-text-parameter
       - csit-perf-trial-duration-parameter:
@@ -1216,8 +1213,7 @@
           project: '{project}'
       - gerrit-parameter:
           branch: '{branch}'
-      - gerrit-refspec-parameter:
-          refspec: '$GERRIT_REFSPEC'
+      - gerrit-refspec-parameter
       - gerrit-event-type-parameter
       - gerrit-event-comment-text-parameter
       - csit-perf-trial-duration-parameter:
@@ -1302,8 +1298,7 @@
           project: '{project}'
       - gerrit-parameter:
           branch: '{branch}'
-      - gerrit-refspec-parameter:
-          refspec: '$GERRIT_REFSPEC'
+      - gerrit-refspec-parameter
       - gerrit-event-type-parameter
       - gerrit-event-comment-text-parameter
       - csit-perf-trial-duration-parameter:
@@ -1388,8 +1383,7 @@
           project: '{project}'
       - gerrit-parameter:
           branch: '{branch}'
-      - gerrit-refspec-parameter:
-          refspec: '$GERRIT_REFSPEC'
+      - gerrit-refspec-parameter
       - gerrit-event-type-parameter
       - gerrit-event-comment-text-parameter
       - csit-perf-trial-duration-parameter:
@@ -1474,8 +1468,7 @@
           project: '{project}'
       - gerrit-parameter:
           branch: '{branch}'
-      - gerrit-refspec-parameter:
-          refspec: '$GERRIT_REFSPEC'
+      - gerrit-refspec-parameter
       - gerrit-event-type-parameter
       - gerrit-event-comment-text-parameter
       - csit-perf-trial-duration-parameter:
@@ -1560,8 +1553,7 @@
           project: '{project}'
       - gerrit-parameter:
           branch: '{branch}'
-      - gerrit-refspec-parameter:
-          refspec: '$GERRIT_REFSPEC'
+      - gerrit-refspec-parameter
       - gerrit-event-type-parameter
       - gerrit-event-comment-text-parameter
       - csit-perf-trial-duration-parameter:
@@ -1646,8 +1638,7 @@
           project: '{project}'
       - gerrit-parameter:
           branch: '{branch}'
-      - gerrit-refspec-parameter:
-          refspec: '$GERRIT_REFSPEC'
+      - gerrit-refspec-parameter
       - gerrit-event-type-parameter
       - gerrit-event-comment-text-parameter
       - csit-perf-trial-duration-parameter:

diff --git a/jjb/csit/csit-tox.yaml b/jjb/csit/csit-tox.yaml
index 0e9d7ff..bfb394f 100644 (file)
--- a/jjb/csit/csit-tox.yaml
+++ b/jjb/csit/csit-tox.yaml
@@ -45,8 +45,7 @@
           project: '{project}'
       - gerrit-parameter:
           branch: '{branch}'
-      - gerrit-refspec-parameter:
-          refspec: '$GERRIT_REFSPEC'
+      - gerrit-refspec-parameter
 
     scm:
       - gerrit-trigger-scm:

diff --git a/jjb/csit/csit-vpp-device.yaml b/jjb/csit/csit-vpp-device.yaml
index dbf3ef9..f2a0542 100644 (file)
--- a/jjb/csit/csit-vpp-device.yaml
+++ b/jjb/csit/csit-vpp-device.yaml
@@ -67,8 +67,7 @@
           make-parallel-jobs: '{make-parallel-jobs}'
       - os-parameter:
           os: '{os}'
-      - gerrit-refspec-parameter:
-          refspec: '$GERRIT_REFSPEC'
+      - gerrit-refspec-parameter
       - gerrit-event-type-parameter
       - gerrit-event-comment-text-parameter
       - csit-fail-on-crc-mismatch-parameter:
@@ -123,8 +122,7 @@
           make-parallel-jobs: '{make-parallel-jobs}'
       - os-parameter:
           os: '{os}'
-      - gerrit-refspec-parameter:
-          refspec: '$GERRIT_REFSPEC'
+      - gerrit-refspec-parameter
       - gerrit-event-type-parameter
       - gerrit-event-comment-text-parameter
       # This is an automatic verify job, part of API coverage.

diff --git a/jjb/global-macros.yaml b/jjb/global-macros.yaml
index 2de57c7..25d2785 100644 (file)
--- a/jjb/global-macros.yaml
+++ b/jjb/global-macros.yaml
@@ -872,8 +872,8 @@
                 - SUCCESS
                 - UNSTABLE
               build-steps:
-                - shell: !include-raw-escape: scripts/post_build_executor_info.sh
-                - shell: !include-raw-escape: scripts/post_build_deploy_archives.sh
+                - shell: !include-raw: scripts/post_build_executor_info.sh
+                - shell: !include-raw: scripts/post_build_deploy_archives.sh
                 - fdio-infra-ship-logs
           mark-unstable-if-failed: true
       - workspace-cleanup:
@@ -931,9 +931,9 @@
           files:
             - file-id: "jenkins-s3-docs-ship"
               target: $HOME/.aws/credentials
-      - shell: !include-raw-escape:
+      - shell: !include-raw:
           - scripts/terraform_s3_docs_ship.sh
-      - shell: !include-raw-escape:
+      - shell: !include-raw:
           - scripts/publish_docs.sh
       - shell: !include-raw:
           - ../global-jjb/shell/logs-clear-credentials.sh
@@ -945,9 +945,9 @@
           files:
             - file-id: "jenkins-s3-vpp-docs-ship"
               target: $HOME/.aws/credentials
-      - shell: !include-raw-escape:
+      - shell: !include-raw:
           - scripts/terraform_s3_docs_ship.sh
-      - shell: !include-raw-escape:
+      - shell: !include-raw:
           - scripts/publish_cov.sh
       - shell: !include-raw:
           - ../global-jjb/shell/logs-clear-credentials.sh
@@ -959,9 +959,9 @@
           files:
             - file-id: "jenkins-s3-vpp-docs-ship"
               target: $HOME/.aws/credentials
-      - shell: !include-raw-escape:
+      - shell: !include-raw:
           - scripts/terraform_s3_docs_ship.sh
-      - shell: !include-raw-escape:
+      - shell: !include-raw:
           - scripts/publish_docs.sh
       - shell: !include-raw:
           - ../global-jjb/shell/logs-clear-credentials.sh
@@ -973,7 +973,7 @@
           files:
             - file-id: "jenkins-s3-log-ship"
               target: $HOME/.aws/credentials
-      - shell: !include-raw-escape:
+      - shell: !include-raw:
           - scripts/publish_library_py.sh
       - shell: !include-raw:
           - scripts/publish_logs.sh