From 5b83338fe7aafc732f5c7c8aa04e75ef80e8e161 Mon Sep 17 00:00:00 2001 From: Dave Wallace Date: Fri, 23 Apr 2021 15:22:14 -0400 Subject: Remove deprecated fdio-infra-shiplogs macro - Update node labels, replacing deprecated 'snergster' labels with equivalent 'fdiotools' node labels Change-Id: I1ff7d42b2c4f4f592567378b7f1fe359ff7e2a0f Signed-off-by: Dave Wallace --- jjb/global-macros.yaml | 37 ------------------------------------- jjb/hc2vpp/hc2vpp-csit.yaml | 15 +++++---------- jjb/hc2vpp/hc2vpp.yaml | 9 +++------ jjb/udpi/udpi.yaml | 10 ++++------ jjb/vsap/vsap.yaml | 10 ++++------ 5 files changed, 16 insertions(+), 65 deletions(-) diff --git a/jjb/global-macros.yaml b/jjb/global-macros.yaml index 42ed9078..dfcb815c 100644 --- a/jjb/global-macros.yaml +++ b/jjb/global-macros.yaml @@ -685,43 +685,6 @@ - "**/*.jenkins-trigger" fail-build: false -- publisher: - name: fdio-infra-shiplogs - # To archive things, the job will need to create an "archives" directory in - # the workspace and this macro will handle copying the contents of the - # archives directory. - # - # Uses the build parameter ARCHIVE_ARTIFACTS if not empty to find files to - # archive. You can pass globstar patterns for example "**/*.xml **/*.log" as - # the archive pattern. This is a space separated list of files to archive. - # - # Also ensure that the workspace is cleaned up at the end of the build. - publishers: - - postbuildscript: - builders: - - role: BOTH - build-on: - - ABORTED - - FAILURE - - NOT_BUILT - - SUCCESS - - UNSTABLE - build-steps: - - shell: !include-raw: include-raw-deploy-archives.sh - - maven-target: - maven-version: '{maven-version}' - pom: '.archives/deploy-archives.xml' - goals: 'clean deploy -V -B -q -Dmaven.repo.local=/tmp/r' - settings: 'jenkins-log-archives-settings' - settings-type: cfp - global-settings: 'global-settings' - global-settings-type: cfp - - description-setter: - regexp: '^Build logs: .*' - mark-unstable-if-failed: true - - workspace-cleanup: - fail-build: false - - publisher: name: jacoco-report publishers: diff --git a/jjb/hc2vpp/hc2vpp-csit.yaml b/jjb/hc2vpp/hc2vpp-csit.yaml index a0a18b4f..76ef8741 100644 --- a/jjb/hc2vpp/hc2vpp-csit.yaml +++ b/jjb/hc2vpp/hc2vpp-csit.yaml @@ -94,8 +94,7 @@ - robot-report: output-path: 'csit/archive' - - fdio-infra-shiplogs: - maven-version: 'mvn36' + - lf-infra-publish - job-template: name: 'hc2vpp-csit-verify-{stream}-{os}' @@ -190,8 +189,7 @@ - robot-report: output-path: 'csit/archive' - - fdio-infra-shiplogs: - maven-version: 'mvn36' + - lf-infra-publish - job-template: name: 'hc2vpp-csit-integration-odl-{odl}-{stream}-{os}' @@ -248,8 +246,7 @@ - robot-report: output-path: 'csit/archive' - - fdio-infra-shiplogs: - maven-version: 'mvn36' + - lf-infra-publish - job-template: name: 'hc2vpp-csit-verify-odl-{odl}-{stream}-{os}' @@ -343,8 +340,7 @@ - robot-report: output-path: 'csit/archive' - - fdio-infra-shiplogs: - maven-version: 'mvn36' + - lf-infra-publish - job-template: name: 'hc2vpp-csit-perf-{stream}-{os}' @@ -414,8 +410,7 @@ - robot-report: output-path: 'csit/archive' - - fdio-infra-shiplogs: - maven-version: 'mvn36' + - lf-infra-publish - parameter: name: odl-parameter diff --git a/jjb/hc2vpp/hc2vpp.yaml b/jjb/hc2vpp/hc2vpp.yaml index d8aef513..c8ac1d81 100644 --- a/jjb/hc2vpp/hc2vpp.yaml +++ b/jjb/hc2vpp/hc2vpp.yaml @@ -79,8 +79,7 @@ publishers: - email-notification: email-prefix: '[hc2vpp]' - - fdio-infra-shiplogs: - maven-version: 'mvn36' + - lf-infra-publish - job-template: name: 'hc2vpp-merge-{stream}-{os}' @@ -145,8 +144,7 @@ branch: '{stream}' - email-notification: email-prefix: '[hc2vpp]' - - fdio-infra-shiplogs: - maven-version: 'mvn36' + - lf-infra-publish - job-template: name: 'hc2vpp-integration-{stream}-{os}' @@ -249,8 +247,7 @@ unique-version: true deploy-unstable: false release-env-var: SKIP_JAR_DEPLOY - - fdio-infra-shiplogs: - maven-version: 'mvn36' + - lf-infra-publish - project: name: hc2vpp-info diff --git a/jjb/udpi/udpi.yaml b/jjb/udpi/udpi.yaml index fa2b7eee..7086f4d5 100644 --- a/jjb/udpi/udpi.yaml +++ b/jjb/udpi/udpi.yaml @@ -45,7 +45,7 @@ name: 'udpi-verify-{stream}-{os}' project-type: freestyle - node: '{os}-us' + node: 'builder-{os}-prod-x86_64' concurrent: true build-discarder: @@ -104,8 +104,7 @@ - include-raw-udpi-build.sh publishers: - - fdio-infra-shiplogs: - maven-version: 'mvn36' + - fdio-infra-publish - naginator: rerun-unstable-builds: false max-failed-builds: 1 @@ -115,7 +114,7 @@ name: 'udpi-merge-{stream}-{os}' project-type: freestyle - node: '{os}-us' + node: 'builder-{os}-prod-x86_64' build-discarder: daysToKeep: '{build-days-to-keep}' @@ -173,8 +172,7 @@ - ../scripts/packagecloud_push.sh publishers: - - fdio-infra-shiplogs: - maven-version: 'mvn36' + - fdio-infra-publish - naginator: rerun-unstable-builds: false max-failed-builds: 1 diff --git a/jjb/vsap/vsap.yaml b/jjb/vsap/vsap.yaml index 711f9b9b..31c4b432 100644 --- a/jjb/vsap/vsap.yaml +++ b/jjb/vsap/vsap.yaml @@ -45,7 +45,7 @@ name: 'vsap-verify-{stream}-{os}-{mode}' project-type: freestyle - node: '{os}-us' + node: 'builder-{os}-prod-x86_64' concurrent: true build-discarder: @@ -97,14 +97,13 @@ - include-raw-vsap-build.sh publishers: - - fdio-infra-shiplogs: - maven-version: 'mvn36' + - fdio-infra-publish - job-template: name: 'vsap-merge-{stream}-{os}-{mode}' project-type: freestyle - node: '{os}-us' + node: 'builder-{os}-prod-x86_64' build-discarder: daysToKeep: '{build-days-to-keep}' @@ -166,8 +165,7 @@ - ../scripts/packagecloud_push.sh publishers: - - fdio-infra-shiplogs: - maven-version: 'mvn36' + - fdio-infra-publish - project: name: vsap-info -- cgit 1.2.3-korg