From: Thanh Ha Date: Mon, 12 Jun 2017 22:52:24 +0000 (-0400) Subject: Rename odl-global-settings to global-settings X-Git-Tag: release/boron-sr4~29 X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=commitdiff_plain;h=5f69f878295ea8209444ad163d0c1cc6f3ebf775;p=releng%2Fbuilder.git Rename odl-global-settings to global-settings Simplify the naming to be consistent with other LF projects for this file. Change-Id: I875f9a5c51074627b7c617957a185e3e2fb5ba80 Signed-off-by: Thanh Ha --- diff --git a/jjb/autorelease/autorelease-macros.yaml b/jjb/autorelease/autorelease-macros.yaml index 9d24d31d2d..00316524b5 100644 --- a/jjb/autorelease/autorelease-macros.yaml +++ b/jjb/autorelease/autorelease-macros.yaml @@ -40,7 +40,7 @@ files: - file-id: 'autorelease-settings' variable: 'SETTINGS_FILE' - - file-id: 'odl-global-settings' + - file-id: 'global-settings' variable: 'GLOBAL_SETTINGS_FILE' - builder: diff --git a/jjb/autorelease/autorelease-projects.yaml b/jjb/autorelease/autorelease-projects.yaml index 1d7682b020..208a0643c8 100644 --- a/jjb/autorelease/autorelease-projects.yaml +++ b/jjb/autorelease/autorelease-projects.yaml @@ -175,7 +175,7 @@ goals: '-version' settings: 'autorelease-settings' settings-type: cfp - global-settings: 'odl-global-settings' + global-settings: 'global-settings' global-settings-type: cfp - wipe-local-maven-repo - jacoco-nojava-workaround @@ -183,7 +183,7 @@ - autorelease-determine-merge-order - autorelease-cfp: autorelease-settings: 'autorelease-settings' - odl-global-settings: 'odl-global-settings' + global-settings: 'odl-global-settings' - autorelease-generate-taglist - autorelease-distribute-taglist - autorelease-generate-release-patches @@ -204,7 +204,7 @@ - '-Xmx10g -XX:MaxPermSize=1024m -Dmaven.compile.fork=true' settings: 'autorelease-settings' settings-type: cfp - global-settings: 'odl-global-settings' + global-settings: 'global-settings' global-settings-type: cfp - autorelease-maven-deploy - autorelease-get-integration-test-variables @@ -212,7 +212,7 @@ opendaylight-infra-mvn-opts: '{opendaylight-infra-mvn-opts}' maven-version: 'mvn33' settings: 'autorelease-settings' - global-settings: 'odl-global-settings' + global-settings: 'global-settings' - autorelease-maven-sources-post-process - shell: | mkdir -p archives/ diff --git a/jjb/autorelease/autorelease-templates.yaml b/jjb/autorelease/autorelease-templates.yaml index f25731dae7..ba7e013b1b 100644 --- a/jjb/autorelease/autorelease-templates.yaml +++ b/jjb/autorelease/autorelease-templates.yaml @@ -69,7 +69,7 @@ goals: '-version' settings: 'autorelease-settings' settings-type: cfp - global-settings: 'odl-global-settings' + global-settings: 'global-settings' global-settings-type: cfp - wipe-local-maven-repo - jacoco-nojava-workaround @@ -77,7 +77,7 @@ - autorelease-determine-merge-order - autorelease-cfp: autorelease-settings: 'autorelease-settings' - odl-global-settings: 'odl-global-settings' + global-settings: 'odl-global-settings' - autorelease-generate-taglist - autorelease-distribute-taglist - distribute-build-url: @@ -102,7 +102,7 @@ - '-Xmx10g -XX:MaxPermSize=1024m -Dmaven.compile.fork=true' settings: 'autorelease-settings' settings-type: cfp - global-settings: 'odl-global-settings' + global-settings: 'global-settings' global-settings-type: cfp - autorelease-maven-deploy - autorelease-get-integration-test-variables @@ -110,7 +110,7 @@ opendaylight-infra-mvn-opts: '{opendaylight-infra-mvn-opts}' maven-version: 'mvn33' settings: 'autorelease-settings' - global-settings: 'odl-global-settings' + global-settings: 'global-settings' - autorelease-maven-sources-post-process - shell: | mkdir -p archives/ @@ -198,7 +198,7 @@ goals: '-version' settings: autorelease-settings settings-type: cfp - global-settings: odl-global-settings + global-settings: global-settings global-settings-type: cfp - autorelease-cfp - shell: !include-raw-escape: @@ -251,7 +251,7 @@ {opendaylight-infra-mvn-opts} settings: autorelease-settings settings-type: cfp - global-settings: odl-global-settings + global-settings: global-settings global-settings-type: cfp - autorelease-generate-release-notes diff --git a/jjb/integration/distribution/distribution-jobs.yaml b/jjb/integration/distribution/distribution-jobs.yaml index 801c41d17b..6f94ff1f66 100644 --- a/jjb/integration/distribution/distribution-jobs.yaml +++ b/jjb/integration/distribution/distribution-jobs.yaml @@ -43,7 +43,7 @@ builders: - wipe-org-opendaylight-repo - provide-maven-settings: - global-settings-file: 'odl-global-settings' + global-settings-file: 'global-settings' settings-file: 'integration-settings' - maven-target: maven-version: mvn33 @@ -56,7 +56,7 @@ - '-Xmx1024m -XX:MaxPermSize=256m' settings: integration-settings settings-type: cfp - global-settings: odl-global-settings + global-settings: global-settings global-settings-type: cfp publishers: @@ -112,7 +112,7 @@ - wipe-org-opendaylight-repo - jacoco-nojava-workaround - provide-maven-settings: - global-settings-file: 'odl-global-settings' + global-settings-file: 'global-settings' settings-file: 'integration-settings' - integration-set-variables - distribute-build-url: @@ -128,7 +128,7 @@ maven-opts: '-Xmx1024m -XX:MaxPermSize=256m' settings: 'integration-settings' settings-type: cfp - global-settings: 'odl-global-settings' + global-settings: 'global-settings' global-settings-type: cfp postbuilders: @@ -152,7 +152,7 @@ - '-Xmx2g' settings: 'integration-settings' settings-type: cfp - global-settings: 'odl-global-settings' + global-settings: 'global-settings' global-settings-type: cfp - maven-target: maven-version: 'mvn33' @@ -162,7 +162,7 @@ - '-Xmx2g' settings: 'integration-settings' settings-type: cfp - global-settings: 'odl-global-settings' + global-settings: 'global-settings' global-settings-type: cfp - integration-compare-distributions # TODO: the output of the above command is not *friendly* for the reader because the most important info diff --git a/jjb/integration/integration-macros.yaml b/jjb/integration/integration-macros.yaml index 4c22732f81..6b48c8847a 100644 --- a/jjb/integration/integration-macros.yaml +++ b/jjb/integration/integration-macros.yaml @@ -466,7 +466,7 @@ builders: - config-file-provider: files: - - file-id: odl-global-settings + - file-id: global-settings variable: GLOBAL_SETTINGS_FILE - file-id: integration-settings variable: SETTINGS_FILE diff --git a/jjb/integration/integration-templates.yaml b/jjb/integration/integration-templates.yaml index 09bc1c1877..f98ced42fd 100644 --- a/jjb/integration/integration-templates.yaml +++ b/jjb/integration/integration-templates.yaml @@ -1422,7 +1422,7 @@ - '-Xmx4096m -XX:MaxPermSize=1024m -Dmaven.compile.fork=true' settings: integration-settings settings-type: cfp - global-settings: odl-global-settings + global-settings: global-settings global-settings-type: cfp - maven-target: maven-version: mvn33 @@ -1436,7 +1436,7 @@ - '-Xmx1024m -XX:MaxPermSize=256m -Dmaven.compile.fork=true' settings: integration-settings settings-type: cfp - global-settings: odl-global-settings + global-settings: global-settings global-settings-type: cfp - integration-upload-distribution: dist-pom: distribution/pom.xml diff --git a/jjb/integration/integration-test-jobs.yaml b/jjb/integration/integration-test-jobs.yaml index 8ce41700b3..122d48ff5f 100644 --- a/jjb/integration/integration-test-jobs.yaml +++ b/jjb/integration/integration-test-jobs.yaml @@ -290,7 +290,7 @@ - integration-rebase-gerrit-patch - wipe-org-opendaylight-repo - provide-maven-settings: - global-settings-file: 'odl-global-settings' + global-settings-file: 'global-settings' settings-file: 'integration-settings' - maven-target: maven-version: 'mvn33' @@ -304,7 +304,7 @@ - '-Xmx4096m -XX:MaxPermSize=1024m -Dmaven.compile.fork=true' settings: integration-settings settings-type: cfp - global-settings: odl-global-settings + global-settings: global-settings global-settings-type: cfp - maven-target: maven-version: mvn33 @@ -316,7 +316,7 @@ - '-Xmx1024m -XX:MaxPermSize=256m -Dmaven.compile.fork=true' settings: integration-settings settings-type: cfp - global-settings: odl-global-settings + global-settings: global-settings global-settings-type: cfp - integration-upload-distribution: dist-pom: distribution/pom.xml @@ -393,7 +393,7 @@ - wipe-org-opendaylight-repo - integration-multipatch-builder - provide-maven-settings: - global-settings-file: 'odl-global-settings' + global-settings-file: 'global-settings' settings-file: 'yangtools-settings' - maven-target: maven-version: mvn33 @@ -408,7 +408,7 @@ - '-Xmx7168m -XX:MaxPermSize=1024m -Dmaven.compile.fork=true' settings: integration-settings settings-type: cfp - global-settings: odl-global-settings + global-settings: global-settings global-settings-type: cfp - integration-upload-distribution: dist-pom: patch_tester/distribution/pom.xml diff --git a/jjb/netvirt/netvirt-full-integration.yaml b/jjb/netvirt/netvirt-full-integration.yaml index c0f16f1f0e..911e0eb087 100644 --- a/jjb/netvirt/netvirt-full-integration.yaml +++ b/jjb/netvirt/netvirt-full-integration.yaml @@ -46,7 +46,7 @@ - '-Xmx1024m -XX:MaxPermSize=256m' settings: 'netvirt-settings' settings-type: cfp - global-settings: 'odl-global-settings' + global-settings: 'global-settings' global-settings-type: cfp - builder: @@ -71,7 +71,7 @@ - '-Xmx1024m -XX:MaxPermSize=256m' settings: 'netvirt-settings' settings-type: cfp - global-settings: 'odl-global-settings' + global-settings: 'global-settings' global-settings-type: cfp - builder: @@ -205,7 +205,7 @@ - '-Xmx1024m -XX:MaxPermSize=256m' settings: 'netvirt-settings' settings-type: cfp - global-settings: 'odl-global-settings' + global-settings: 'global-settings' global-settings-type: cfp # skip 2.4.0 until we figure out conntrack # - run-netvirt-it: diff --git a/jjb/netvirt/netvirt-sonar.yaml b/jjb/netvirt/netvirt-sonar.yaml index e95258acfc..8d274b9e27 100644 --- a/jjb/netvirt/netvirt-sonar.yaml +++ b/jjb/netvirt/netvirt-sonar.yaml @@ -68,7 +68,7 @@ - '-Xmx1024m -XX:MaxPermSize=256m' settings: 'netvirt-settings' settings-type: cfp - global-settings: 'odl-global-settings' + global-settings: 'global-settings' global-settings-type: cfp - inject: properties-file: env.properties @@ -87,7 +87,7 @@ - 'org.ops4j.pax.url.mvn.localRepository=/tmp/r' settings: 'netvirt-settings' settings-type: cfp - global-settings: 'odl-global-settings' + global-settings: 'global-settings' global-settings-type: cfp - maven-target: maven-version: 'mvn33' @@ -104,7 +104,7 @@ - 'org.ops4j.pax.url.mvn.localRepository=/tmp/r' settings: 'netvirt-settings' settings-type: cfp - global-settings: 'odl-global-settings' + global-settings: 'global-settings' global-settings-type: cfp - shell: !include-raw-escape: include-raw-setup-docker.sh - inject: @@ -126,7 +126,7 @@ - 'ovsdb.userspace.enabled=yes' settings: 'netvirt-settings' settings-type: cfp - global-settings: 'odl-global-settings' + global-settings: 'global-settings' global-settings-type: cfp - maven-target: maven-version: 'mvn33' @@ -140,7 +140,7 @@ -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r settings: 'netvirt-settings' settings-type: cfp - global-settings: 'odl-global-settings' + global-settings: 'global-settings' global-settings-type: cfp - shell: !include-raw-escape: include-raw-cleanup-docker.sh - jacoco-nojava-workaround diff --git a/jjb/ovsdb/ovsdb-full-integration.yaml b/jjb/ovsdb/ovsdb-full-integration.yaml index 7809ab2c2c..c5711b65f0 100644 --- a/jjb/ovsdb/ovsdb-full-integration.yaml +++ b/jjb/ovsdb/ovsdb-full-integration.yaml @@ -45,7 +45,7 @@ - '-Xmx1024m -XX:MaxPermSize=256m' settings: 'ovsdb-settings' settings-type: cfp - global-settings: 'odl-global-settings' + global-settings: 'global-settings' global-settings-type: cfp - builder: @@ -163,7 +163,7 @@ - '-Xmx1024m -XX:MaxPermSize=256m' settings: 'ovsdb-settings' settings-type: cfp - global-settings: 'odl-global-settings' + global-settings: 'global-settings' global-settings-type: cfp - run-ovsdb-it: maven-version: 'mvn33' diff --git a/jjb/ovsdb/ovsdb-sonar.yaml b/jjb/ovsdb/ovsdb-sonar.yaml index 9deb830e73..f669024a64 100644 --- a/jjb/ovsdb/ovsdb-sonar.yaml +++ b/jjb/ovsdb/ovsdb-sonar.yaml @@ -57,7 +57,7 @@ - '-Xmx1024m -XX:MaxPermSize=256m' settings: 'ovsdb-settings' settings-type: cfp - global-settings: 'odl-global-settings' + global-settings: 'global-settings' global-settings-type: cfp - inject: properties-file: env.properties @@ -75,7 +75,7 @@ - 'ovsdb.userspace.enabled=yes' settings: 'ovsdb-settings' settings-type: cfp - global-settings: 'odl-global-settings' + global-settings: 'global-settings' global-settings-type: cfp - maven-target: maven-version: 'mvn33' @@ -88,7 +88,7 @@ -Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r settings: 'ovsdb-settings' settings-type: cfp - global-settings: 'odl-global-settings' + global-settings: 'global-settings' global-settings-type: cfp - shell: !include-raw-escape: include-raw-cleanup-docker.sh - jacoco-nojava-workaround diff --git a/jjb/releng-defaults.yaml b/jjb/releng-defaults.yaml index 734e5202d0..b366575ce0 100644 --- a/jjb/releng-defaults.yaml +++ b/jjb/releng-defaults.yaml @@ -24,7 +24,6 @@ # server-name is deprecated, use gerrit-server-name moving forward. server-name: 'OpenDaylight' git-url: 'ssh://jenkins-$SILO@git.opendaylight.org:29418' - global-settings-file: odl-global-settings # defaults for parameters installing openstack for csit jobs create-initial-networks: 'False' diff --git a/jjb/releng-macros.yaml b/jjb/releng-macros.yaml index 1f5ab47108..2bee7e7770 100644 --- a/jjb/releng-macros.yaml +++ b/jjb/releng-macros.yaml @@ -544,7 +544,7 @@ - '-Xmx4096m -XX:MaxPermSize=1024m -Dmaven.compile.fork=true' settings: 'integration-settings' settings-type: cfp - global-settings: 'odl-global-settings' + global-settings: 'global-settings' global-settings-type: cfp - builder: @@ -583,7 +583,7 @@ - '-Xmx1024m -XX:MaxPermSize=256m -Dmaven.compile.fork=true' settings: 'integration-settings' settings-type: cfp - global-settings: 'odl-global-settings' + global-settings: 'global-settings' global-settings-type: cfp - builder: diff --git a/jjb/releng-templates-java.yaml b/jjb/releng-templates-java.yaml index adda3abdc4..ee30c6ba9b 100644 --- a/jjb/releng-templates-java.yaml +++ b/jjb/releng-templates-java.yaml @@ -39,7 +39,7 @@ builders: - provide-maven-settings: - global-settings-file: 'odl-global-settings' + global-settings-file: 'global-settings' settings-file: '{mvn-settings}' - maven-target: maven-version: 'mvn33' @@ -52,7 +52,7 @@ - '-Xmx4096m -XX:MaxPermSize=512m' settings: '{mvn-settings}' settings-type: cfp - global-settings: 'odl-global-settings' + global-settings: 'global-settings' global-settings-type: cfp - shell: 'find . -regex ".*karaf/target" | xargs rm -rf' - check-clm: @@ -110,7 +110,7 @@ builders: - jacoco-nojava-workaround - provide-maven-settings: - global-settings-file: 'odl-global-settings' + global-settings-file: 'global-settings' settings-file: '{mvn-settings}' - maven-target: maven-version: 'mvn33' @@ -121,7 +121,7 @@ - '{mvn-opts}' settings: '{mvn-settings}' settings-type: cfp - global-settings: 'odl-global-settings' + global-settings: 'global-settings' global-settings-type: cfp publishers: @@ -183,7 +183,7 @@ prebuilders: - jacoco-nojava-workaround - provide-maven-settings: - global-settings-file: 'odl-global-settings' + global-settings-file: 'global-settings' settings-file: '{mvn-settings}' # TODO: Do we want to apply sophisticated checks as in *-distribution-check-*? @@ -197,7 +197,7 @@ maven-opts: '{mvn-opts}' settings: '{mvn-settings}' settings-type: cfp - global-settings: 'odl-global-settings' + global-settings: 'global-settings' global-settings-type: cfp post-step-run-condition: UNSTABLE @@ -222,7 +222,7 @@ - '-Xmx2g' settings: '{mvn-settings}' settings-type: cfp - global-settings: 'odl-global-settings' + global-settings: 'global-settings' global-settings-type: cfp - maven-target: maven-version: 'mvn33' @@ -232,7 +232,7 @@ - '-Xmx2g' settings: '{mvn-settings}' settings-type: cfp - global-settings: 'odl-global-settings' + global-settings: 'global-settings' global-settings-type: cfp reporters: @@ -291,7 +291,7 @@ builders: - jacoco-nojava-workaround - provide-maven-settings: - global-settings-file: 'odl-global-settings' + global-settings-file: 'global-settings' settings-file: '{mvn-settings}' - maven-target: maven-version: 'mvn33' @@ -303,7 +303,7 @@ - '{mvn-opts}' settings: '{mvn-settings}' settings-type: cfp - global-settings: 'odl-global-settings' + global-settings: 'global-settings' global-settings-type: cfp - maven-target: maven-version: 'mvn33' @@ -319,7 +319,7 @@ - '{mvn-opts}' settings: '{mvn-settings}' settings-type: cfp - global-settings: 'odl-global-settings' + global-settings: 'global-settings' global-settings-type: cfp publishers: @@ -403,7 +403,7 @@ - '-Xmx8g' settings: 'autorelease-settings' settings-type: cfp - global-settings: 'odl-global-settings' + global-settings: 'global-settings' global-settings-type: cfp - maven-target: maven-version: 'mvn33' @@ -416,7 +416,7 @@ - '-Xmx8g -XX:MaxPermSize=1024m -Dmaven.compile.fork=true' settings: 'autorelease-settings' settings-type: cfp - global-settings: 'odl-global-settings' + global-settings: 'global-settings' global-settings-type: cfp publishers: @@ -472,7 +472,7 @@ builders: - jacoco-nojava-workaround - provide-maven-settings: - global-settings-file: 'odl-global-settings' + global-settings-file: 'global-settings' settings-file: '{mvn-settings}' - maven-target: maven-version: '{mvn-version}' @@ -484,7 +484,7 @@ - '{mvn-opts}' settings: '{mvn-settings}' settings-type: cfp - global-settings: 'odl-global-settings' + global-settings: 'global-settings' global-settings-type: cfp publishers: diff --git a/jjb/releng-templates.yaml b/jjb/releng-templates.yaml index 0971a1f8e3..422c8690da 100644 --- a/jjb/releng-templates.yaml +++ b/jjb/releng-templates.yaml @@ -42,7 +42,7 @@ - wipe-org-opendaylight-repo - jacoco-nojava-workaround - provide-maven-settings: - global-settings-file: 'odl-global-settings' + global-settings-file: 'global-settings' settings-file: 'autorelease-settings' - maven-target: maven-version: 'mvn33' @@ -57,7 +57,7 @@ - '-Xmx1024m -XX:MaxPermSize=256m' settings: 'autorelease-settings' settings-type: cfp - global-settings: 'odl-global-settings' + global-settings: 'global-settings' global-settings-type: cfp - releng-stage-release @@ -96,7 +96,7 @@ - releng-fetch-p2zip-if-necessary: maven-version: 'mvn33' settings: '{mvn-settings}' - global-settings: 'odl-global-settings' + global-settings: 'global-settings' - releng-generate-p2pom - maven-target: maven-version: 'mvn33' @@ -104,12 +104,12 @@ goals: 'clean deploy -V -B -Dmaven.repo.local=/tmp/r' settings: '{mvn-settings}' settings-type: cfp - global-settings: 'odl-global-settings' + global-settings: 'global-settings' global-settings-type: cfp - releng-update-p2composite-metadata: maven-version: 'mvn33' settings: '{mvn-settings}' - global-settings: 'odl-global-settings' + global-settings: 'global-settings' publishers: - email-notification: