summaryrefslogtreecommitdiffstats
path: root/jjb/global-macros.yaml
diff options
context:
space:
mode:
authorDave Wallace <dwallacelf@gmail.com>2024-03-22 12:00:30 +0000
committerDave Wallace <dwallacelf@gmail.com>2024-03-22 12:00:30 +0000
commit8e6b8f2659a45f29a7207470c4fe90ea78d5593a (patch)
tree21b821aad551c1f1e8ef944a984f82fe04cbfc76 /jjb/global-macros.yaml
parentcbe4988f0e9e9668919c0dd5cdd03d1e925ce93f (diff)
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>
Diffstat (limited to 'jjb/global-macros.yaml')
-rw-r--r--jjb/global-macros.yaml18
1 files changed, 9 insertions, 9 deletions
diff --git a/jjb/global-macros.yaml b/jjb/global-macros.yaml
index 2de57c72..25d2785c 100644
--- 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