From fbf357f8bad5de6705f20bb08540a4d29fd66552 Mon Sep 17 00:00:00 2001 From: Anil Belur Date: Mon, 29 Aug 2016 18:46:33 +1000 Subject: [PATCH] Rename archive-build macro to opendaylight-infra-shiplogs Change-Id: Ib2e823501d7814d11fbfe5f972fd440f7c8c7f27 Signed-off-by: Anil Belur --- jjb/autorelease/autorelease-templates.yaml | 4 ++-- jjb/docs/docs-rtd.yaml | 4 ++-- .../integration-distribution-jobs.yaml | 8 ++++---- jjb/integration/integration-templates.yaml | 18 +++++++++--------- jjb/integration/integration-test-jobs.yaml | 6 +++--- jjb/netvirt/netvirt-full-integration.yaml | 2 +- jjb/netvirt/netvirt-openstack.yaml | 2 +- jjb/netvirt/netvirt-sonar.yaml | 2 +- jjb/opflex/opflex-custom.yaml | 4 ++-- jjb/ovsdb/ovsdb-full-integration.yaml | 2 +- jjb/ovsdb/ovsdb-sonar.yaml | 2 +- jjb/releng-jobs.yaml | 10 +++++----- jjb/releng-macros.yaml | 2 +- jjb/releng-templates-java.yaml | 18 +++++++++--------- jjb/releng-templates.yaml | 10 +++++----- 15 files changed, 47 insertions(+), 47 deletions(-) diff --git a/jjb/autorelease/autorelease-templates.yaml b/jjb/autorelease/autorelease-templates.yaml index bdfa06a71..6a5e9f823 100644 --- a/jjb/autorelease/autorelease-templates.yaml +++ b/jjb/autorelease/autorelease-templates.yaml @@ -85,7 +85,7 @@ condition: UNSTABLE_OR_BETTER property-file: variables.prop fail-on-missing: true - - archive-build: + - opendaylight-infra-shiplogs: maven-version: '{mvn33}' - job-template: @@ -151,7 +151,7 @@ Archive also available on Jenkins at $BUILD_URL always: true - - archive-build: + - opendaylight-infra-shiplogs: maven-version: '{mvn33}' ### diff --git a/jjb/docs/docs-rtd.yaml b/jjb/docs/docs-rtd.yaml index edfbb7c48..66abc6133 100644 --- a/jjb/docs/docs-rtd.yaml +++ b/jjb/docs/docs-rtd.yaml @@ -60,7 +60,7 @@ publishers: - email-notification: email-prefix: '[docs]' - - archive-build: + - opendaylight-infra-shiplogs: maven-version: '{mvn33}' - job-template: @@ -128,5 +128,5 @@ publishers: - email-notification: email-prefix: '[docs]' - - archive-build: + - opendaylight-infra-shiplogs: maven-version: '{mvn33}' diff --git a/jjb/integration/integration-distribution-jobs.yaml b/jjb/integration/integration-distribution-jobs.yaml index 9bb2c10c5..7689729d1 100644 --- a/jjb/integration/integration-distribution-jobs.yaml +++ b/jjb/integration/integration-distribution-jobs.yaml @@ -96,7 +96,7 @@ publishers: - jacoco-report - - archive-build: + - opendaylight-infra-shiplogs: maven-version: '{mvn33}' - email-notification: email-prefix: '[int/dist]' @@ -196,7 +196,7 @@ unique-version: true deploy-unstable: false - jacoco-report - - archive-build: + - opendaylight-infra-shiplogs: maven-version: '{mvn33}' - email-notification: email-prefix: '[int/dist]' @@ -248,7 +248,7 @@ - email-notification: email-prefix: '[int/dist]' - integration-csit-archive-build - - archive-build: + - opendaylight-infra-shiplogs: maven-version: '{mvn33}' # Template: integration-distribution-offline-{stream} @@ -297,5 +297,5 @@ - email-notification: email-prefix: '[int/dist]' - integration-csit-archive-build - - archive-build: + - opendaylight-infra-shiplogs: maven-version: '{mvn33}' diff --git a/jjb/integration/integration-templates.yaml b/jjb/integration/integration-templates.yaml index d447a21fd..3a875c538 100644 --- a/jjb/integration/integration-templates.yaml +++ b/jjb/integration/integration-templates.yaml @@ -105,7 +105,7 @@ - email-notification: email-prefix: '[{project}]' - integration-csit-archive-build - - archive-build: + - opendaylight-infra-shiplogs: maven-version: '{mvn33}' - job-template: @@ -216,7 +216,7 @@ display-table: true format: csv - integration-csit-archive-build - - archive-build: + - opendaylight-infra-shiplogs: maven-version: '{mvn33}' - job-template: @@ -326,7 +326,7 @@ display-table: true format: csv - integration-csit-archive-build - - archive-build: + - opendaylight-infra-shiplogs: maven-version: '{mvn33}' - job-template: @@ -411,7 +411,7 @@ - email-notification: email-prefix: '[{project}]' - integration-csit-archive-build - - archive-build: + - opendaylight-infra-shiplogs: maven-version: '{mvn33}' - job-template: @@ -523,7 +523,7 @@ display-table: true format: csv - integration-csit-archive-build - - archive-build: + - opendaylight-infra-shiplogs: maven-version: '{mvn33}' - job-template: @@ -635,7 +635,7 @@ display-table: true format: csv - integration-csit-archive-build - - archive-build: + - opendaylight-infra-shiplogs: maven-version: '{mvn33}' - job-template: @@ -746,7 +746,7 @@ display-table: true format: csv - integration-csit-archive-build - - archive-build: + - opendaylight-infra-shiplogs: maven-version: '{mvn33}' - job-template: @@ -859,7 +859,7 @@ - email-notification: email-prefix: '[{project}]' - integration-csit-archive-build - - archive-build: + - opendaylight-infra-shiplogs: maven-version: '{mvn33}' - job-template: @@ -978,7 +978,7 @@ - email-notification: email-prefix: '[{project}]' - integration-csit-archive-build - - archive-build: + - opendaylight-infra-shiplogs: maven-version: '{mvn33}' # Template: {project}-patch-test-{stream} diff --git a/jjb/integration/integration-test-jobs.yaml b/jjb/integration/integration-test-jobs.yaml index 28152f858..f2aa5577e 100644 --- a/jjb/integration/integration-test-jobs.yaml +++ b/jjb/integration/integration-test-jobs.yaml @@ -313,7 +313,7 @@ - email-notification: email-prefix: '[integration]' - integration-csit-archive-build - - archive-build: + - opendaylight-infra-shiplogs: maven-version: '{mvn33}' # Template: integration-distribution-test-{stream} @@ -450,7 +450,7 @@ BUNDLEURL=$BUNDLEURL publishers: - - archive-build: + - opendaylight-infra-shiplogs: maven-version: '{mvn33}' - email-notification: email-prefix: '[$GERRIT_PROJECT]' @@ -518,7 +518,7 @@ BUNDLEURL=$BUNDLEURL publishers: - - archive-build: + - opendaylight-infra-shiplogs: maven-version: '{mvn33}' - email-notification: email-prefix: '[int/dist]' diff --git a/jjb/netvirt/netvirt-full-integration.yaml b/jjb/netvirt/netvirt-full-integration.yaml index 4b9427f01..10fd4fdaf 100644 --- a/jjb/netvirt/netvirt-full-integration.yaml +++ b/jjb/netvirt/netvirt-full-integration.yaml @@ -226,5 +226,5 @@ succeed-if-found: false unstable-if-found: true also-check-console-output: false - - archive-build: + - opendaylight-infra-shiplogs: maven-version: '{mvn33}' diff --git a/jjb/netvirt/netvirt-openstack.yaml b/jjb/netvirt/netvirt-openstack.yaml index c6da032d4..c913c6eca 100644 --- a/jjb/netvirt/netvirt-openstack.yaml +++ b/jjb/netvirt/netvirt-openstack.yaml @@ -84,5 +84,5 @@ failure: true unstable: true fixed: true - - archive-build: + - opendaylight-infra-shiplogs: maven-version: '{mvn33}' diff --git a/jjb/netvirt/netvirt-sonar.yaml b/jjb/netvirt/netvirt-sonar.yaml index 5eda1eff8..37b641cb9 100644 --- a/jjb/netvirt/netvirt-sonar.yaml +++ b/jjb/netvirt/netvirt-sonar.yaml @@ -85,5 +85,5 @@ - email-notification: email-prefix: '[netvirt]' - jacoco-report - - archive-build: + - opendaylight-infra-shiplogs: maven-version: '{mvn33}' diff --git a/jjb/opflex/opflex-custom.yaml b/jjb/opflex/opflex-custom.yaml index 78057b5d0..f9c5f6367 100644 --- a/jjb/opflex/opflex-custom.yaml +++ b/jjb/opflex/opflex-custom.yaml @@ -85,7 +85,7 @@ publishers: - email-notification: email-prefix: '[opflex]' - - archive-build: + - opendaylight-infra-shiplogs: maven-version: '{mvn33}' - job-template: @@ -129,5 +129,5 @@ publishers: - email-notification: email-prefix: '[opflex]' - - archive-build: + - opendaylight-infra-shiplogs: maven-version: '{mvn33}' diff --git a/jjb/ovsdb/ovsdb-full-integration.yaml b/jjb/ovsdb/ovsdb-full-integration.yaml index 79bcbfe64..52cd8fc95 100644 --- a/jjb/ovsdb/ovsdb-full-integration.yaml +++ b/jjb/ovsdb/ovsdb-full-integration.yaml @@ -190,5 +190,5 @@ publishers: - email-notification: email-prefix: '[ovsdb]' - - archive-build: + - opendaylight-infra-shiplogs: maven-version: '{mvn33}' diff --git a/jjb/ovsdb/ovsdb-sonar.yaml b/jjb/ovsdb/ovsdb-sonar.yaml index c1e6ae715..42352fe9a 100644 --- a/jjb/ovsdb/ovsdb-sonar.yaml +++ b/jjb/ovsdb/ovsdb-sonar.yaml @@ -82,5 +82,5 @@ - email-notification: email-prefix: '[ovsdb]' - jacoco-report - - archive-build: + - opendaylight-infra-shiplogs: maven-version: '{mvn33}' diff --git a/jjb/releng-jobs.yaml b/jjb/releng-jobs.yaml index a350fd9ab..89a9ebc3a 100644 --- a/jjb/releng-jobs.yaml +++ b/jjb/releng-jobs.yaml @@ -68,7 +68,7 @@ publishers: - email-notification: email-prefix: '[releng]' - - archive-build: + - opendaylight-infra-shiplogs: maven-version: '{mvn33}' - job-template: @@ -134,7 +134,7 @@ publishers: - email-notification: email-prefix: '[releng]' - - archive-build: + - opendaylight-infra-shiplogs: maven-version: '{mvn33}' - job-template: @@ -198,7 +198,7 @@ publishers: - email-notification: email-prefix: '[releng]' - - archive-build: + - opendaylight-infra-shiplogs: maven-version: '{mvn33}' - job-template: @@ -245,7 +245,7 @@ publishers: - email-notification: email-prefix: '[releng]' - - archive-build: + - opendaylight-infra-shiplogs: maven-version: '{mvn33}' - job-template: @@ -283,5 +283,5 @@ publishers: - email-notification: email-prefix: '[releng]' - - archive-build: + - opendaylight-infra-shiplogs: maven-version: '{mvn33}' diff --git a/jjb/releng-macros.yaml b/jjb/releng-macros.yaml index e8c072b29..bf596fa02 100644 --- a/jjb/releng-macros.yaml +++ b/jjb/releng-macros.yaml @@ -258,7 +258,7 @@ unhealthy: 40 - publisher: - name: archive-build + name: opendaylight-infra-shiplogs # To archive things the job will need to create a "archives" directory in # the workspace and this macro will handle copying the contents of the # archives directory. diff --git a/jjb/releng-templates-java.yaml b/jjb/releng-templates-java.yaml index c5c79fc54..6d3803c5b 100644 --- a/jjb/releng-templates-java.yaml +++ b/jjb/releng-templates-java.yaml @@ -56,7 +56,7 @@ publishers: - email-notification: email-prefix: '[{project-name}]' - - archive-build: + - opendaylight-infra-shiplogs: maven-version: '{mvn33}' - job-template: @@ -119,7 +119,7 @@ id: '' unique-version: true deploy-unstable: false - - archive-build: + - opendaylight-infra-shiplogs: maven-version: '{mvn33}' - job-template: @@ -226,7 +226,7 @@ mark-unstable-if-failed: True - archive: artifacts: '*.zip' - - archive-build: + - opendaylight-infra-shiplogs: maven-version: '{mvn33}' - job-template: @@ -293,7 +293,7 @@ email-prefix: '{email-upstream}' - findbugs - jacoco-report - - archive-build: + - opendaylight-infra-shiplogs: maven-version: '{mvn33}' - job-template: @@ -401,7 +401,7 @@ unique-version: true deploy-unstable: false - jacoco-report - - archive-build: + - opendaylight-infra-shiplogs: maven-version: '{mvn33}' - job-template: @@ -462,7 +462,7 @@ email-prefix: '[{project-name}]' - jacoco-report - findbugs - - archive-build: + - opendaylight-infra-shiplogs: maven-version: '{mvn33}' - job-template: @@ -525,7 +525,7 @@ - email-notification: email-prefix: '[{project-name}]' - jacoco-report - - archive-build: + - opendaylight-infra-shiplogs: maven-version: '{mvn33}' - job-template: @@ -625,7 +625,7 @@ publishers: - email-notification: email-prefix: '[autorelease] [{project-name}]' - - archive-build: + - opendaylight-infra-shiplogs: maven-version: '{mvn33}' - job-template: @@ -688,5 +688,5 @@ - email-notification: email-prefix: '[{project-name}]' - jacoco-report - - archive-build: + - opendaylight-infra-shiplogs: maven-version: '{mvn-version}' diff --git a/jjb/releng-templates.yaml b/jjb/releng-templates.yaml index 2709065f0..643ee3ff5 100644 --- a/jjb/releng-templates.yaml +++ b/jjb/releng-templates.yaml @@ -57,7 +57,7 @@ publishers: - email-notification: email-prefix: '[releng]' - - archive-build: + - opendaylight-infra-shiplogs: maven-version: '{mvn33}' @@ -108,7 +108,7 @@ publishers: - email-notification: email-prefix: '[releng]' - - archive-build: + - opendaylight-infra-shiplogs: maven-version: '{mvn33}' # Python Related @@ -195,7 +195,7 @@ publishers: - email-notification: email-prefix: '[{project}]' - - archive-build: + - opendaylight-infra-shiplogs: maven-version: '{mvn33}' - job-template: @@ -229,7 +229,7 @@ publishers: - email-notification: email-prefix: '[{project}]' - - archive-build: + - opendaylight-infra-shiplogs: maven-version: '{mvn33}' # Node related @@ -324,5 +324,5 @@ publishers: - email-notification: email-prefix: '[{project}]' - - archive-build: + - opendaylight-infra-shiplogs: maven-version: '{mvn33}' -- 2.36.6