From 08a36ea653906faf169ee757baef27eb5885b01a Mon Sep 17 00:00:00 2001 From: Dave Wallace Date: Tue, 23 Nov 2021 18:19:37 -0500 Subject: Nexus retirement CI job clean up - Remove nexus configuration parameters from CI jobs for active FD.io projects - Convert HICN docs jobs to use S3 storage Change-Id: Ida00b6448926567e0245b4988597113bfea0bd84 Signed-off-by: Dave Wallace --- jjb/hicn/hicn.yaml | 147 +++++------------------------------------------------ 1 file changed, 14 insertions(+), 133 deletions(-) (limited to 'jjb/hicn/hicn.yaml') diff --git a/jjb/hicn/hicn.yaml b/jjb/hicn/hicn.yaml index 901a9edd..6ecc1f38 100644 --- a/jjb/hicn/hicn.yaml +++ b/jjb/hicn/hicn.yaml @@ -17,81 +17,50 @@ jobs: - "hicn-verify-{stream}-{os}-{executor-arch}" - "hicn-merge-{stream}-{os}-{executor-arch}" - project: "hicn" - os: - - ubuntu2004: - repo-os-part: "ubuntu.focal.main" - + os: ubuntu2004 executor-arch: "x86_64" - stream: - "master": branch: "master" - repo-stream-part: "master" - repository-name: "hicn" - "2101": branch: "stable/2101" - repo-stream-part: "stable.2101" - repository-name: "hicn" - project: name: hicn-aarch64 jobs: - "hicn-verify-{stream}-{os}-{executor-arch}" - "hicn-merge-{stream}-{os}-{executor-arch}" - project: "hicn" - - os: - - ubuntu2004: - repo-os-part: "ubuntu-arm.focal.main" - + os: ubuntu2004 executor-arch: "aarch64" - stream: - master: branch: "master" - repo-stream-part: "master" - repository-name: "hicn" - "2101": branch: "stable/2101" - repo-stream-part: "stable.2101" - repository-name: "hicn" - project: name: hicn-beta-x86_64 jobs: - "hicn-verify-{stream}-{os}-{executor-arch}" - project: "hicn" - os: - - ubuntu2004: - repo-os-part: "ubuntu.focal.main" - + os: ubuntu2004 executor-arch: "x86_64" - stream: - lightng: branch: "hicn-light-ng" - repo-stream-part: "hicn-light-ng" - project: name: hicn-beta-aarch64 jobs: - "hicn-verify-{stream}-{os}-{executor-arch}" - project: "hicn" - os: - - ubuntu2004: - repo-os-part: "ubuntu-arm.focal.main" - + os: ubuntu2004 executor-arch: "aarch64" - stream: - lightng: branch: "hicn-light-ng" - repo-stream-part: "hicn-light-ng" - project: name: hicn-misc @@ -101,17 +70,11 @@ stream: - master: branch: "master" - repo-stream-part: "master" - "2101": branch: "stable/2101" - repo-stream-part: "stable.2101" - repository-name: "hicn" - lightng: branch: "hicn-light-ng" - repo-stream-part: "hicn-light-ng" - os: - - ubuntu2004: - repo-os-part: "ubuntu.focal.main" + os: ubuntu2004 executor-arch: "x86_64" - project: @@ -120,34 +83,23 @@ - "hicn-extras-verify-{stream}-{os}-{executor-arch}" - "hicn-extras-build-{stream}-{os}-{executor-arch}" project: "hicn" - os: - - ubuntu2004: - repo-os-part: "ubuntu.focal.main" - + os: ubuntu2004 executor-arch: "x86_64" - stream: - master: branch: "master" - repo-stream-part: "master" - project: name: hicn-extras-aarch64 jobs: - "hicn-extras-verify-{stream}-{os}-{executor-arch}" - "hicn-extras-build-{stream}-{os}-{executor-arch}" - project: "hicn" - os: - - ubuntu2004: - repo-os-part: "ubuntu-arm.focal.main" - + os: ubuntu2004 executor-arch: "aarch64" - stream: - master: branch: "master" - repo-stream-part: "master" - project: name: hicn-view @@ -161,7 +113,6 @@ project-type: freestyle node: "builder-{os}-prod-{executor-arch}" concurrent: true - archive-artifacts: "**/tmp/hicn-failed-unittests/*/* **/core" properties: - lf-infra-properties: @@ -174,10 +125,6 @@ branch: "{branch}" - os-parameter: os: "{os}" - - repo-name-parameter: - repo-name: "{repo-stream-part}.ubuntu.bionic.main" - - archive-artifacts-parameter: - artifacts: '{archive-artifacts}' scm: - gerrit-trigger-scm: @@ -234,7 +181,7 @@ - shell: !include-raw-escape: - ../scripts/setup_executor_env.sh - shell: !include-raw-escape: - - include-raw-hicn-checkstyle.sh + - ../scripts/hicn/checkstyle.sh publishers: - fdio-infra-publish @@ -261,12 +208,8 @@ branch: "{branch}" - os-parameter: os: "{os}" - - repo-name-parameter: - repo-name: "{repo-stream-part}.{repo-os-part}" - stream-parameter: stream: "{stream}" - - archive-artifacts-parameter: - artifacts: '{archive-artifacts}' scm: - gerrit-trigger-scm: @@ -287,14 +230,10 @@ - shell: !include-raw-escape: - ../scripts/setup_executor_env.sh - shell: !include-raw-escape: - - include-raw-hicn-build.sh + - ../scripts/hicn/build.sh publishers: - fdio-infra-publish - - naginator: - rerun-unstable-builds: false - max-failed-builds: 2 - fixed-delay: 90 - job-template: name: "hicn-merge-{stream}-{os}-{executor-arch}" @@ -313,16 +252,8 @@ branch: "{branch}" - os-parameter: os: "{os}" - - maven-project-parameter: - maven: "mvn33-new" - - maven-exec: - maven-version: "mvn33-new" - stream-parameter: - stream: "{repository-name}" - - repo-name-parameter: - repo-name: "{repo-stream-part}.{repo-os-part}" - - archive-artifacts-parameter: - artifacts: '{archive-artifacts}' + stream: "{stream}" scm: - gerrit-trigger-scm: @@ -348,34 +279,17 @@ files: - file-id: "packagecloud_api" target: "/root/packagecloud_api" - - maven-target: - maven-version: "mvn33-new" - goals: "--version" - settings: "hicn-settings" - settings-type: cfp - global-settings: "global-settings" - global-settings-type: cfp - shell: !include-raw-escape: - ../scripts/setup_executor_env.sh - shell: !include-raw-escape: - - include-raw-hicn-checkstyle.sh + - ../scripts/hicn/checkstyle.sh - shell: !include-raw-escape: - - include-raw-hicn-build.sh - - provide-maven-settings: - settings-file: "hicn-settings" - global-settings-file: "global-settings" + - ../scripts/hicn/build.sh - shell: !include-raw-escape: - ../scripts/packagecloud_push.sh - - shell: !include-raw-escape: - - ../scripts/maven_push_functions.sh - - include-raw-hicn-maven-push.sh publishers: - fdio-infra-publish - - naginator: - rerun-unstable-builds: false - max-failed-builds: 1 - fixed-delay: 90 - project: name: hicn-sonar @@ -409,12 +323,8 @@ branch: "{branch}" - os-parameter: os: "{os}" - - repo-name-parameter: - repo-name: "{repo-stream-part}.{repo-os-part}" - stream-parameter: stream: "{stream}" - - archive-artifacts-parameter: - artifacts: '{archive-artifacts}' scm: - gerrit-trigger-scm: @@ -443,14 +353,10 @@ - shell: !include-raw-escape: - ../scripts/setup_executor_env.sh - shell: !include-raw-escape: - - include-raw-hicn-extras-build.sh + - ../scripts/hicn/build-extras.sh publishers: - fdio-infra-publish - - naginator: - rerun-unstable-builds: false - max-failed-builds: 2 - fixed-delay: 90 - job-template: name: "hicn-extras-build-{stream}-{os}-{executor-arch}" @@ -469,16 +375,8 @@ branch: "{branch}" - os-parameter: os: "{os}" - - maven-project-parameter: - maven: "mvn33-new" - - maven-exec: - maven-version: "mvn33-new" - stream-parameter: stream: "hicn" - - repo-name-parameter: - repo-name: "{repo-stream-part}.{repo-os-part}" - - archive-artifacts-parameter: - artifacts: '{archive-artifacts}' scm: - gerrit-trigger-scm: @@ -512,32 +410,15 @@ files: - file-id: "packagecloud_api" target: "/root/packagecloud_api" - - maven-target: - maven-version: "mvn33-new" - goals: "--version" - settings: "hicn-settings" - settings-type: cfp - global-settings: "global-settings" - global-settings-type: cfp - shell: !include-raw-escape: - ../scripts/setup_executor_env.sh - shell: !include-raw-escape: - - include-raw-hicn-extras-build.sh - - provide-maven-settings: - settings-file: "hicn-settings" - global-settings-file: "global-settings" + - ../scripts/hicn/build-extras.sh - shell: !include-raw-escape: - ../scripts/packagecloud_push.sh - - shell: !include-raw-escape: - - ../scripts/maven_push_functions.sh - - include-raw-hicn-maven-push.sh publishers: - fdio-infra-publish - - naginator: - rerun-unstable-builds: false - max-failed-builds: 1 - fixed-delay: 90 - project: name: hicn-info -- cgit 1.2.3-korg