From: Jessica Wagantall Date: Thu, 14 Jan 2021 20:19:17 +0000 (-0800) Subject: Deprecate infra-shiplogs macro X-Git-Url: https://gerrit.onap.org/r/gitweb?a=commitdiff_plain;h=2a6a38013765e729cd487daa026642eb649c65d3;p=ci-management.git Deprecate infra-shiplogs macro We should be using lf-infra-publish as a publisher macro. This global-jjb macro performs a job-cost run that we need to report for all jobs. Issue-ID: CIMAN-33 Signed-off-by: Jessica Wagantall Change-Id: Iff43723322ac7eb92f1e9e93e49dfe9595af6450 --- diff --git a/jjb/doc/doc-templates-rtd.yaml b/jjb/doc/doc-templates-rtd.yaml index be97b2943..d4e542404 100644 --- a/jjb/doc/doc-templates-rtd.yaml +++ b/jjb/doc/doc-templates-rtd.yaml @@ -82,8 +82,7 @@ mv docs/_build/html "$WORKSPACE/archives/" publishers: - - infra-shiplogs: - maven-version: '{maven-version}' + - lf-infra-publish - job-template: # Job template for merging/publishing Sphinx/Restructured Text at RTD @@ -160,6 +159,4 @@ - shell: !include-raw: doc-post-rtd.sh publishers: - - infra-shiplogs: - maven-version: '{maven-version}' - + - lf-infra-publish diff --git a/jjb/global-macros.yaml b/jjb/global-macros.yaml index 13afecf1c..0c614bf85 100644 --- a/jjb/global-macros.yaml +++ b/jjb/global-macros.yaml @@ -239,35 +239,6 @@ new-normal: 1 new-low: 1 -- publisher: - name: infra-shiplogs - # lf-infra macro to finish up a build. - # - # Handles the following: - # - Shipping logs to Nexus logs site repository - # - Cleanup workspace - publishers: - - postbuildscript: - builders: - - role: BOTH - build-on: - - ABORTED - - FAILURE - - NOT_BUILT - - SUCCESS - - UNSTABLE - build-steps: - - lf-infra-sysstat - - lf-infra-ship-logs - mark-unstable-if-failed: true - - workspace-cleanup: - exclude: - # Do not clean up *.jenkins-trigger files for jobs that use a - # properties file as input for triggering another build. - - '**/*.jenkins-trigger' - fail-build: false - - # SCMS - scm: name: git-scm diff --git a/jjb/global-templates-docker.yaml b/jjb/global-templates-docker.yaml index a1a051fbb..c340b1ea3 100644 --- a/jjb/global-templates-docker.yaml +++ b/jjb/global-templates-docker.yaml @@ -301,6 +301,9 @@ PARENT_JOB_NAME=$JOB_NAME DOCKERHUB_REGISTRY=docker.io + publishers: + - lf-infra-publish + - job-template: # Job template for tagging snapshot docker images # identified by given unique tag as STAGING @@ -347,6 +350,4 @@ - shell: '{script}' publishers: - - infra-shiplogs: - maven-version: '{maven-version}' - + - lf-infra-publish diff --git a/jjb/global-templates-golang.yaml b/jjb/global-templates-golang.yaml index d29528a3b..b19fe3806 100644 --- a/jjb/global-templates-golang.yaml +++ b/jjb/global-templates-golang.yaml @@ -68,8 +68,7 @@ - shell: '{script}' publishers: - - infra-shiplogs: - maven-version: '{maven-version}' + - lf-infra-publish - job-template: # Job template for Golang verify jobs with subproject support @@ -139,8 +138,7 @@ make deploy publishers: - - infra-shiplogs: - maven-version: '{maven-version}' + - lf-infra-publish - job-template: # Job template for building & pushing docker images @@ -199,8 +197,7 @@ - shell: '{script}' publishers: - - infra-shiplogs: - maven-version: '{maven-version}' + - lf-infra-publish - job-template: # Job template for building and pushing uniquely tagged @@ -254,5 +251,4 @@ - shell: '{script}' publishers: - - infra-shiplogs: - maven-version: '{maven-version}' + - lf-infra-publish diff --git a/jjb/global-templates-java.yaml b/jjb/global-templates-java.yaml index 813eccc03..ff021db1c 100644 --- a/jjb/global-templates-java.yaml +++ b/jjb/global-templates-java.yaml @@ -75,8 +75,7 @@ global-settings-type: cfp publishers: - - infra-shiplogs: - maven-version: '{maven-version}' + - lf-infra-publish - job-template: # Job template for Java verify jobs running checkstyle at the end @@ -93,9 +92,9 @@ <<: *verify_java_defaults name: '{project-name}-{stream}-verify-java-checkstyle' + publishers: - - infra-shiplogs: - maven-version: '{maven-version}' + - lf-infra-publish - checkstyle-result - job-template: @@ -204,9 +203,9 @@ settings-type: cfp global-settings: 'global-settings' global-settings-type: cfp + publishers: - - infra-shiplogs: - maven-version: '{maven-version}' + - lf-infra-publish - checkstyle-result-daily - job-template: @@ -281,8 +280,7 @@ global-settings-type: cfp publishers: - - infra-shiplogs: - maven-version: '{maven-version}' + - lf-infra-publish - job-template: &merge_java_defaults # Job template for Java merge jobs @@ -365,8 +363,7 @@ properties: '{obj:mvn_properties}' publishers: - - infra-shiplogs: - maven-version: '{maven-version}' + - lf-infra-publish - job-template: # Job template for Java merge jobs based on @@ -506,8 +503,7 @@ mvn-params: '{mvn-params}' publishers: - - infra-shiplogs: - maven-version: '{maven-version}' + - lf-infra-publish - job-template: # Job template for Docker daily jobs @@ -592,8 +588,7 @@ - shell: '{script}' publishers: - - infra-shiplogs: - maven-version: '{maven-version}' + - lf-infra-publish - job-template: # Job template for building & pushing docker images @@ -661,8 +656,7 @@ - shell: '{script}' publishers: - - infra-shiplogs: - maven-version: '{maven-version}' + - lf-infra-publish - job-template: # Job template for building & pushing docker images @@ -737,8 +731,7 @@ - shell: '{script}' publishers: - - infra-shiplogs: - maven-version: '{maven-version}' + - lf-infra-publish - job-template: # Job template for building & pushing docker images @@ -816,8 +809,7 @@ - shell: '{script}' publishers: - - infra-shiplogs: - maven-version: '{maven-version}' + - lf-infra-publish - job-template: &docker_version_java_defaults # Job template for building & pushing docker images @@ -894,8 +886,7 @@ mvn-params: '{mvn-params}' publishers: - - infra-shiplogs: - maven-version: '{maven-version}' + - lf-infra-publish - job-template: # Job template for building & pushing docker images @@ -1005,8 +996,7 @@ - shell: !include-raw-escape: include-docker-push.sh publishers: - - infra-shiplogs: - maven-version: '{maven-version}' + - lf-infra-publish - job-template: # Job template for Java merge jobs for SDC specific repos diff --git a/jjb/global-templates-python.yaml b/jjb/global-templates-python.yaml index 6480daa81..6f3c8363d 100644 --- a/jjb/global-templates-python.yaml +++ b/jjb/global-templates-python.yaml @@ -68,9 +68,7 @@ tox publishers: - - infra-shiplogs: - maven-version: '{maven-version}' - + - lf-infra-publish - job-template: # Job template for docker daily jobs for 3 SCMs @@ -130,6 +128,6 @@ properties-file: version.properties - docker-login - shell: '{script}' + publishers: - - infra-shiplogs: - maven-version: '{maven-version}' + - lf-infra-publish diff --git a/jjb/global-templates-script.yaml b/jjb/global-templates-script.yaml index 831c77049..20735ae62 100644 --- a/jjb/global-templates-script.yaml +++ b/jjb/global-templates-script.yaml @@ -124,10 +124,7 @@ - shell: '{script}' publishers: - - infra-shiplogs: - maven-version: '{maven-version}' - - + - lf-infra-publish # vim: sw=2 ts=2 sts=2 et : @@ -197,8 +194,7 @@ - shell: '{script}' publishers: - - infra-shiplogs: - maven-version: '{maven-version}' + - lf-infra-publish - job-template: # Job template for two scm and script trigger - for docker daily release @@ -265,5 +261,4 @@ - shell: '{script}' publishers: - - infra-shiplogs: - maven-version: '{maven-version}' + - lf-infra-publish diff --git a/jjb/integration/integration-templates-docker.yaml b/jjb/integration/integration-templates-docker.yaml index 9c2682d43..a0fafde4e 100644 --- a/jjb/integration/integration-templates-docker.yaml +++ b/jjb/integration/integration-templates-docker.yaml @@ -59,8 +59,7 @@ - docker.push.registry=nexus3.onap.org:10003 publishers: - - infra-shiplogs: - maven-version: '{maven-version}' + - lf-infra-publish - job-template: name: '{project-name}-{stream}-{subproject}-docker-verify' @@ -124,8 +123,7 @@ - shell: '{post-docker-verify-script}' publishers: - - infra-shiplogs: - maven-version: '{maven-version}' + - lf-infra-publish - job-template: name: '{project-name}-{stream}-{subproject}-docker-compose-verify' diff --git a/jjb/vnfrqts/build-and-upload.yaml b/jjb/vnfrqts/build-and-upload.yaml index 69f158cea..0df13c59e 100644 --- a/jjb/vnfrqts/build-and-upload.yaml +++ b/jjb/vnfrqts/build-and-upload.yaml @@ -66,5 +66,4 @@ - lf-provide-maven-settings-cleanup publishers: - - infra-shiplogs: - maven-version: '{maven-version}' + - lf-infra-publish