summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorVratko Polak <vrpolak@cisco.com>2021-05-04 15:29:05 +0000
committerGerrit Code Review <gerrit@fd.io>2021-05-04 15:29:05 +0000
commit21374182275e54a2e8d290fc881ba90b3dab0acb (patch)
tree28662038edf2d6b8f6f28dda66e30a7e7d01687d
parent1fb419681d9738d890e90e9ac7cd8e36cafc5d4d (diff)
parent5b83338fe7aafc732f5c7c8aa04e75ef80e8e161 (diff)
Merge "Remove deprecated fdio-infra-shiplogs macro"
-rw-r--r--jjb/global-macros.yaml37
-rw-r--r--jjb/hc2vpp/hc2vpp-csit.yaml15
-rw-r--r--jjb/hc2vpp/hc2vpp.yaml9
-rw-r--r--jjb/udpi/udpi.yaml10
-rw-r--r--jjb/vsap/vsap.yaml10
5 files changed, 16 insertions, 65 deletions
diff --git a/jjb/global-macros.yaml b/jjb/global-macros.yaml
index b465d49..7cdf555 100644
--- a/jjb/global-macros.yaml
+++ b/jjb/global-macros.yaml
@@ -678,43 +678,6 @@
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:
- jacoco:
diff --git a/jjb/hc2vpp/hc2vpp-csit.yaml b/jjb/hc2vpp/hc2vpp-csit.yaml
index a0a18b4..76ef874 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 d8aef51..c8ac1d8 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 fa2b7ee..7086f4d 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 711f9b9..31c4b43 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