From 2db30aa5a938494a710a89cab5943675c1143918 Mon Sep 17 00:00:00 2001 From: Dave Wallace Date: Thu, 1 Oct 2020 20:38:47 +0000 Subject: Clean up vpp jenkins scripts & docker dir - Remove docker/vpp Dockerfile definitions and colateral files for image now being build by https://gerrit.fd.io/r/c/ci-management/+/28022 - Remove opensuse support which has been elided from the vpp build in https://gerrit.fd.io/r/c/vpp/+/28999 - Remove unused scripts. - Output script name marker for all jjb scripts following LFIT practices. - Remove old/unused output from scripts. - Add logic to use vpp-ext-deps download cache in the executor images to speed up build jobs. - Add copyright notifcations to modified files without an existing copyright. - Make all vpp/docs jobs use '-{stream}-{os}-{executor}' suffix in their names. - Consolidate executor logging into setup_executor_env.sh and call it first for all jobs. Change-Id: I4ffb67ed476659f0127ca8c84f20a305d06149bf Signed-off-by: Dave Wallace --- jjb/csit/csit-perf.yaml | 30 ++++++++++++++++++++++++++++++ jjb/csit/csit-tox.yaml | 3 +++ jjb/csit/csit-vpp-device.yaml | 9 +++++++++ jjb/csit/csit.yaml | 9 +++++++++ 4 files changed, 51 insertions(+) (limited to 'jjb/csit') diff --git a/jjb/csit/csit-perf.yaml b/jjb/csit/csit-perf.yaml index a64d13ddd..1a277f7ad 100644 --- a/jjb/csit/csit-perf.yaml +++ b/jjb/csit/csit-perf.yaml @@ -268,6 +268,9 @@ skip-vote: false builders: + - shell: + !include-raw-escape: + - ../scripts/setup_executor_env.sh - shell: !include-raw-escape: - ../scripts/csit/perf-verify.sh @@ -343,6 +346,9 @@ - shell: 'echo "BRANCH_ID={branch-id}" > $WORKSPACE/variables.prop' - inject: properties-file: variables.prop + - shell: + !include-raw-escape: + - ../scripts/setup_executor_env.sh - shell: !include-raw-escape: - ../scripts/csit/perf-timed.sh @@ -418,6 +424,9 @@ - shell: 'echo "BRANCH_ID={branch-id}" > $WORKSPACE/variables.prop' - inject: properties-file: variables.prop + - shell: + !include-raw-escape: + - ../scripts/setup_executor_env.sh - shell: !include-raw-escape: - ../scripts/csit/perf-timed.sh @@ -488,6 +497,9 @@ - shell: 'echo "BRANCH_ID={branch-id}" > $WORKSPACE/variables.prop' - inject: properties-file: variables.prop + - shell: + !include-raw-escape: + - ../scripts/setup_executor_env.sh - shell: !include-raw-escape: - ../scripts/csit/perf-timed.sh @@ -586,6 +598,9 @@ skip-vote: false builders: + - shell: + !include-raw-escape: + - ../scripts/setup_executor_env.sh - shell: !include-raw-escape: - ../scripts/csit/perf-verify.sh @@ -661,6 +676,9 @@ - shell: 'echo "BRANCH_ID={branch-id}" > $WORKSPACE/variables.prop' - inject: properties-file: variables.prop + - shell: + !include-raw-escape: + - ../scripts/setup_executor_env.sh - shell: !include-raw-escape: - ../scripts/csit/perf-timed.sh @@ -757,6 +775,9 @@ skip-vote: false builders: + - shell: + !include-raw-escape: + - ../scripts/setup_executor_env.sh - shell: !include-raw-escape: - ../scripts/csit/perf-verify.sh @@ -853,6 +874,9 @@ skip-vote: false builders: + - shell: + !include-raw-escape: + - ../scripts/setup_executor_env.sh - shell: !include-raw-escape: - ../scripts/csit/perf-verify.sh @@ -949,6 +973,9 @@ skip-vote: false builders: + - shell: + !include-raw-escape: + - ../scripts/setup_executor_env.sh - shell: !include-raw-escape: - ../scripts/csit/perf-verify.sh @@ -1045,6 +1072,9 @@ skip-vote: false builders: + - shell: + !include-raw-escape: + - ../scripts/setup_executor_env.sh - shell: !include-raw-escape: - ../scripts/csit/perf-verify.sh diff --git a/jjb/csit/csit-tox.yaml b/jjb/csit/csit-tox.yaml index 33b0d6ab8..88f575b1f 100644 --- a/jjb/csit/csit-tox.yaml +++ b/jjb/csit/csit-tox.yaml @@ -73,6 +73,9 @@ branch: '{branch}' builders: + - shell: + !include-raw-escape: + - ../scripts/setup_executor_env.sh - shell: !include-raw-escape: - ../scripts/csit/tox.sh diff --git a/jjb/csit/csit-vpp-device.yaml b/jjb/csit/csit-vpp-device.yaml index da53e3b31..934130a67 100644 --- a/jjb/csit/csit-vpp-device.yaml +++ b/jjb/csit/csit-vpp-device.yaml @@ -148,6 +148,9 @@ skip-vote: '{skip-vote}' builders: + - shell: + !include-raw-escape: + - ../scripts/setup_executor_env.sh - shell: !include-raw-escape: - ../scripts/csit/device-verify.sh @@ -232,6 +235,9 @@ - shell: 'echo "BRANCH_ID={branch-id}" > $WORKSPACE/variables.prop' - inject: properties-file: variables.prop + - shell: + !include-raw-escape: + - ../scripts/setup_executor_env.sh - shell: !include-raw-escape: - ../scripts/csit/device-semiweekly.sh @@ -317,6 +323,9 @@ branch: '{branch}' builders: + - shell: + !include-raw-escape: + - ../scripts/setup_executor_env.sh - shell: !include-raw-escape: - ../scripts/csit/device-verify.sh diff --git a/jjb/csit/csit.yaml b/jjb/csit/csit.yaml index 2724ec1c3..b12cf420b 100644 --- a/jjb/csit/csit.yaml +++ b/jjb/csit/csit.yaml @@ -113,6 +113,9 @@ - provide-maven-settings: settings-file: 'csit-settings' global-settings-file: 'global-settings' + - shell: + !include-raw-escape: + - ../scripts/setup_executor_env.sh - shell: !include-raw-escape: - ../scripts/csit/docs.sh @@ -189,6 +192,9 @@ - provide-maven-settings: settings-file: 'csit-settings' global-settings-file: 'global-settings' + - shell: + !include-raw-escape: + - ../scripts/setup_executor_env.sh - shell: !include-raw-escape: - ../scripts/csit/report.sh @@ -242,6 +248,9 @@ - provide-maven-settings: settings-file: 'csit-settings' global-settings-file: 'global-settings' + - shell: + !include-raw-escape: + - ../scripts/setup_executor_env.sh - shell: !include-raw-escape: - ../scripts/csit/cpta.sh -- cgit 1.2.3-korg