diff options
Diffstat (limited to 'jjb')
| -rw-r--r-- | jjb/ci-management/ci-management-jobs.yaml | 2 | ||||
| -rw-r--r-- | jjb/csit/csit-perf.yaml | 27 | ||||
| -rw-r--r-- | jjb/csit/csit-tox.yaml | 3 | ||||
| -rw-r--r-- | jjb/csit/csit-vpp-device.yaml | 6 | ||||
| -rw-r--r-- | jjb/global-macros.yaml | 18 |
5 files changed, 22 insertions, 34 deletions
diff --git a/jjb/ci-management/ci-management-jobs.yaml b/jjb/ci-management/ci-management-jobs.yaml index 3380eda7b..58f4d4cf6 100644 --- 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 76c509079..78dd9fd86 100644 --- 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 0e9d7ffc2..bfb394f65 100644 --- 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 dbf3ef931..f2a05420c 100644 --- 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 2de57c726..25d2785ca 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 |