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/vpp/docs.yaml | 46 ++++++++++++++++++++++++++++++++-------------- jjb/vpp/vpp.yaml | 39 ++++++++++++++++++++++++++++++++++++--- 2 files changed, 68 insertions(+), 17 deletions(-) (limited to 'jjb/vpp') diff --git a/jjb/vpp/docs.yaml b/jjb/vpp/docs.yaml index 84ed58c8b..d2665144b 100644 --- a/jjb/vpp/docs.yaml +++ b/jjb/vpp/docs.yaml @@ -2,10 +2,10 @@ - project: name: docs jobs: - - 'vpp-docs-merge-{stream}' - - 'vpp-docs-verify-{stream}' - - 'vpp-make-test-docs-merge-{stream}' - - 'vpp-make-test-docs-verify-{stream}' + - 'vpp-docs-merge-{stream}-{os}-{executor-arch}' + - 'vpp-docs-verify-{stream}-{os}-{executor-arch}' + - 'vpp-make-test-docs-merge-{stream}-{os}-{executor-arch}' + - 'vpp-make-test-docs-verify-{stream}-{os}-{executor-arch}' project: 'vpp' executor-arch: 'x86_64' @@ -26,8 +26,8 @@ - project: name: sphinx jobs: - - 'vpp-sphinx-docs-merge-{stream}' - - 'vpp-sphinx-docs-verify-{stream}' + - 'vpp-sphinx-docs-merge-{stream}-{os}-{executor-arch}' + - 'vpp-sphinx-docs-verify-{stream}-{os}-{executor-arch}' project: 'vpp' executor-arch: 'x86_64' @@ -38,7 +38,7 @@ branch: 'master' - job-template: - name: 'vpp-docs-verify-{stream}' + name: 'vpp-docs-verify-{stream}-{os}-{executor-arch}' project-type: freestyle node: 'builder-{os}-prod-{executor-arch}' @@ -93,6 +93,9 @@ - provide-maven-settings: settings-file: 'vpp-settings' global-settings-file: 'global-settings' + - shell: + !include-raw-escape: + - ../scripts/setup_executor_env.sh - shell: !include-raw-escape: - ../scripts/setup_vpp_ubuntu_docker_test.sh @@ -105,7 +108,7 @@ maven-version: 'mvn36' - job-template: - name: 'vpp-docs-merge-{stream}' + name: 'vpp-docs-merge-{stream}-{os}-{executor-arch}' project-type: freestyle node: 'builder-{os}-prod-{executor-arch}' @@ -149,7 +152,7 @@ triggers: - reverse: - jobs: 'vpp-merge-{stream}-ubuntu1804' + jobs: 'vpp-merge-{stream}-{os}-{executor-arch}' result: 'success' - gerrit: server-name: 'Primary' @@ -179,6 +182,9 @@ - provide-maven-settings: settings-file: 'vpp-settings' global-settings-file: 'global-settings' + - shell: + !include-raw-escape: + - ../scripts/setup_executor_env.sh - shell: !include-raw-escape: - ../scripts/setup_vpp_ubuntu_docker_test.sh @@ -191,7 +197,7 @@ maven-version: 'mvn36' - job-template: - name: 'vpp-sphinx-docs-verify-{stream}' + name: 'vpp-sphinx-docs-verify-{stream}-{os}-{executor-arch}' project-type: freestyle node: 'builder-{os}-prod-{executor-arch}' @@ -259,6 +265,9 @@ - provide-maven-settings: settings-file: 'vpp-settings' global-settings-file: 'global-settings' + - shell: + !include-raw-escape: + - ../scripts/setup_executor_env.sh - shell: !include-raw-escape: - ../scripts/setup_vpp_ubuntu_docker_test.sh @@ -271,7 +280,7 @@ maven-version: 'mvn36' - job-template: - name: 'vpp-sphinx-docs-merge-{stream}' + name: 'vpp-sphinx-docs-merge-{stream}-{os}-{executor-arch}' project-type: freestyle node: 'builder-{os}-prod-{executor-arch}' @@ -337,6 +346,9 @@ - provide-maven-settings: settings-file: 'vpp-settings' global-settings-file: 'global-settings' + - shell: + !include-raw-escape: + - ../scripts/setup_executor_env.sh - shell: !include-raw-escape: - ../scripts/setup_vpp_ubuntu_docker_test.sh @@ -349,7 +361,7 @@ maven-version: 'mvn36' - job-template: - name: 'vpp-make-test-docs-verify-{stream}' + name: 'vpp-make-test-docs-verify-{stream}-{os}-{executor-arch}' project-type: freestyle node: 'builder-{os}-prod-{executor-arch}' @@ -404,6 +416,9 @@ - provide-maven-settings: settings-file: 'vpp-settings' global-settings-file: 'global-settings' + - shell: + !include-raw-escape: + - ../scripts/setup_executor_env.sh - shell: !include-raw-escape: - ../scripts/setup_vpp_ubuntu_docker_test.sh @@ -416,7 +431,7 @@ maven-version: 'mvn36' - job-template: - name: 'vpp-make-test-docs-merge-{stream}' + name: 'vpp-make-test-docs-merge-{stream}-{os}-{executor-arch}' project-type: freestyle node: 'builder-{os}-prod-{executor-arch}' @@ -461,7 +476,7 @@ triggers: - reverse: - jobs: 'vpp-merge-{stream}-ubuntu1804' + jobs: 'vpp-merge-{stream}-{os}-{executor-arch}' result: 'success' - gerrit: server-name: 'Primary' @@ -491,6 +506,9 @@ - provide-maven-settings: settings-file: 'vpp-settings' global-settings-file: 'global-settings' + - shell: + !include-raw-escape: + - ../scripts/setup_executor_env.sh - shell: !include-raw-escape: - ../scripts/setup_vpp_ubuntu_docker_test.sh diff --git a/jjb/vpp/vpp.yaml b/jjb/vpp/vpp.yaml index fc9042a30..0edaddcae 100644 --- a/jjb/vpp/vpp.yaml +++ b/jjb/vpp/vpp.yaml @@ -21,7 +21,7 @@ - project: name: vpp-checkstyle-x86_64 jobs: - - 'vpp-checkstyle-verify-{stream}-{executor-arch}' + - 'vpp-checkstyle-verify-{stream}-{os}-{executor-arch}' project: 'vpp' stream: - master: @@ -200,9 +200,11 @@ - master: branch: 'master' repo-stream-part: 'master' + branch-head-refspec: '' - '2009': branch: 'stable/2009' repo-stream-part: 'stable.2009' + branch-head-refspec: '' # [end] VPP-GCC-X86_64 PROJECT # VPP-AARCH64 PROJECT @@ -408,7 +410,7 @@ # VPP-CHECKSTYLE-VERIFY JOB TEMPLATE - job-template: - name: 'vpp-checkstyle-verify-{stream}-{executor-arch}' + name: 'vpp-checkstyle-verify-{stream}-{os}-{executor-arch}' project-type: freestyle node: 'builder-{os}-prod-{executor-arch}' @@ -500,6 +502,9 @@ notbuilt: false builders: + - shell: + !include-raw-escape: + - ../scripts/setup_executor_env.sh - shell: !include-raw-escape: - ../scripts/vpp/checkstyle.sh @@ -569,6 +574,9 @@ branch: '{branch}' builders: + - shell: + !include-raw-escape: + - ../scripts/setup_executor_env.sh - shell: !include-raw-escape: - ../scripts/setup_vpp_ubuntu_docker_test.sh @@ -633,6 +641,9 @@ branch: '{branch}' builders: + - shell: + !include-raw-escape: + - ../scripts/setup_executor_env.sh - shell: !include-raw-escape: - ../scripts/setup_vpp_ubuntu_docker_test.sh @@ -707,6 +718,9 @@ files: - file-id: 'packagecloud_api' target: '/root' + - shell: + !include-raw-escape: + - ../scripts/setup_executor_env.sh - shell: !include-raw-escape: - ../scripts/setup_vpp_ubuntu_docker_test.sh @@ -781,6 +795,9 @@ branch: '{branch}' builders: + - shell: + !include-raw-escape: + - ../scripts/setup_executor_env.sh - shell: !include-raw-escape: - ../scripts/setup_vpp_ubuntu_docker_test.sh @@ -856,6 +873,9 @@ files: - file-id: 'packagecloud_api' target: '/root' + - shell: + !include-raw-escape: + - ../scripts/setup_executor_env.sh - shell: !include-raw-escape: - ../scripts/vpp/checkstyle.sh @@ -912,7 +932,8 @@ description: Artifacts to archive to the logs server. - make-parallel-jobs-parameter: make-parallel-jobs: '{make-parallel-jobs}' - - gerrit-refspec-parameter + - gerrit-refspec-parameter: + refspec: '{branch-head-refspec}' scm: - gerrit-trigger-scm: @@ -930,6 +951,9 @@ branch: '{branch}' builders: + - shell: + !include-raw-escape: + - ../scripts/setup_executor_env.sh - shell: !include-raw-escape: - ../scripts/setup_vpp_ubuntu_docker_test.sh @@ -1007,6 +1031,9 @@ skip-vote: '{skip-vote}' builders: + - shell: + !include-raw-escape: + - ../scripts/setup_executor_env.sh - shell: !include-raw-escape: - ../scripts/setup_vpp_ubuntu_docker_test.sh @@ -1098,6 +1125,9 @@ skip-vote: true builders: + - shell: + !include-raw-escape: + - ../scripts/setup_executor_env.sh - shell: !include-raw-escape: - ../scripts/setup_vpp_ubuntu_docker_test.sh @@ -1167,6 +1197,9 @@ branch: '{branch}' builders: + - shell: + !include-raw-escape: + - ../scripts/setup_executor_env.sh - shell: !include-raw-escape: - ../scripts/setup_vpp_ubuntu_docker_test.sh -- cgit 1.2.3-korg