From 9787e9c2088874c66836d31c3f6854c975fd9653 Mon Sep 17 00:00:00 2001 From: Luis Gomez Date: Fri, 13 Apr 2018 19:43:15 -0700 Subject: [PATCH] Adjust CSIT for UM projects UM projects can use Managed distribution (SNAPSHOT or Release) and add their own feature repo in their csit jjb file. This is much better than using local distribution. Change-Id: Ib5d08347f809129157f95fa29b36a87c2416adf6 Signed-off-by: Luis Gomez --- .../integration-configure-clustering.sh | 5 ++++- .../integration-deploy-controller-run-test.sh | 5 ++++- jjb/integration/integration-macros.yaml | 8 ++++++++ jjb/integration/integration-templates.yaml | 18 ++++++++++++++++++ jjb/releng-defaults.yaml | 1 + jjb/sxp/sxp-csit-basic.yaml | 2 +- jjb/sxp/sxp-csit-cluster-routing.yaml | 2 +- jjb/sxp/sxp-csit-clustering.yaml | 2 +- jjb/sxp/sxp-csit-filtering.yaml | 2 +- jjb/sxp/sxp-csit-performance.yaml | 2 +- jjb/sxp/sxp-csit-topology.yaml | 2 +- jjb/usc/usc-csit-channel.yaml | 2 +- jjb/usc/usc-csit-tcp.yaml | 2 ++ 13 files changed, 44 insertions(+), 9 deletions(-) diff --git a/jjb/integration/integration-configure-clustering.sh b/jjb/integration/integration-configure-clustering.sh index ee18f25406..f0ba1efc41 100644 --- a/jjb/integration/integration-configure-clustering.sh +++ b/jjb/integration/integration-configure-clustering.sh @@ -69,7 +69,7 @@ echo "Extracting the new controller..." unzip -q ${BUNDLE} echo "Adding external repositories..." -sed -ie "s%org.ops4j.pax.url.mvn.repositories=%org.ops4j.pax.url.mvn.repositories=http://repo1.maven.org/maven2@id=central, http://repository.springsource.com/maven/bundles/release@id=spring.ebr.release, http://repository.springsource.com/maven/bundles/external@id=spring.ebr.external, http://zodiac.springsource.com/maven/bundles/release@id=gemini, http://repository.apache.org/content/groups/snapshots-group@id=apache@snapshots@noreleases, https://oss.sonatype.org/content/repositories/snapshots@id=sonatype.snapshots.deploy@snapshots@noreleases, https://oss.sonatype.org/content/repositories/ops4j-snapshots@id=ops4j.sonatype.snapshots.deploy@snapshots@noreleases%g" ${MAVENCONF} +sed -ie "s%org.ops4j.pax.url.mvn.repositories=%org.ops4j.pax.url.mvn.repositories=https://nexus.opendaylight.org/content/repositories/opendaylight.snapshot@id=opendaylight-snapshot@snapshots, https://nexus.opendaylight.org/content/repositories/public@id=opendaylight-mirror, http://repo1.maven.org/maven2@id=central, http://repository.springsource.com/maven/bundles/release@id=spring.ebr.release, http://repository.springsource.com/maven/bundles/external@id=spring.ebr.external, http://zodiac.springsource.com/maven/bundles/release@id=gemini, http://repository.apache.org/content/groups/snapshots-group@id=apache@snapshots@noreleases, https://oss.sonatype.org/content/repositories/snapshots@id=sonatype.snapshots.deploy@snapshots@noreleases, https://oss.sonatype.org/content/repositories/ops4j-snapshots@id=ops4j.sonatype.snapshots.deploy@snapshots@noreleases%g" ${MAVENCONF} cat ${MAVENCONF} echo "Configuring the startup features..." @@ -81,6 +81,9 @@ if [[ "$KARAF_VERSION" == "karaf4" ]]; then fi sed -ie "s%\(featuresRepositories=\|featuresRepositories =\)%featuresRepositories = mvn:org.opendaylight.integration/\${FEATURE_TEST_STRING}/${BUNDLEVERSION}/xml/features,mvn:org.apache.karaf.decanter/apache-karaf-decanter/1.0.0/xml/features,%g" ${FEATURESCONF} +if [[ ! -z "${REPO_URL}" ]]; then + sed -ie "s%featuresRepositories =%featuresRepositories = ${REPO_URL},%g" ${FEATURESCONF} +fi cat ${FEATURESCONF} if [ "${ODL_ENABLE_L3_FWD}" == "yes" ]; then diff --git a/jjb/integration/integration-deploy-controller-run-test.sh b/jjb/integration/integration-deploy-controller-run-test.sh index 423420abaf..f4d56ac2de 100644 --- a/jjb/integration/integration-deploy-controller-run-test.sh +++ b/jjb/integration/integration-deploy-controller-run-test.sh @@ -56,7 +56,7 @@ echo "Extracting the new controller..." unzip -q ${BUNDLE} echo "Adding external repositories..." -sed -ie "s%org.ops4j.pax.url.mvn.repositories=%org.ops4j.pax.url.mvn.repositories=http://repo1.maven.org/maven2@id=central, http://repository.springsource.com/maven/bundles/release@id=spring.ebr.release, http://repository.springsource.com/maven/bundles/external@id=spring.ebr.external, http://zodiac.springsource.com/maven/bundles/release@id=gemini, http://repository.apache.org/content/groups/snapshots-group@id=apache@snapshots@noreleases, https://oss.sonatype.org/content/repositories/snapshots@id=sonatype.snapshots.deploy@snapshots@noreleases, https://oss.sonatype.org/content/repositories/ops4j-snapshots@id=ops4j.sonatype.snapshots.deploy@snapshots@noreleases%g" ${MAVENCONF} +sed -ie "s%org.ops4j.pax.url.mvn.repositories=%org.ops4j.pax.url.mvn.repositories=https://nexus.opendaylight.org/content/repositories/opendaylight.snapshot@id=opendaylight-snapshot@snapshots, https://nexus.opendaylight.org/content/repositories/public@id=opendaylight-mirror, http://repo1.maven.org/maven2@id=central, http://repository.springsource.com/maven/bundles/release@id=spring.ebr.release, http://repository.springsource.com/maven/bundles/external@id=spring.ebr.external, http://zodiac.springsource.com/maven/bundles/release@id=gemini, http://repository.apache.org/content/groups/snapshots-group@id=apache@snapshots@noreleases, https://oss.sonatype.org/content/repositories/snapshots@id=sonatype.snapshots.deploy@snapshots@noreleases, https://oss.sonatype.org/content/repositories/ops4j-snapshots@id=ops4j.sonatype.snapshots.deploy@snapshots@noreleases%g" ${MAVENCONF} cat ${MAVENCONF} if [[ "$USEFEATURESBOOT" == "True" ]]; then @@ -70,6 +70,9 @@ if [[ "$KARAF_VERSION" == "karaf4" ]]; then fi sed -ie "s%\(featuresRepositories=\|featuresRepositories =\)%featuresRepositories = mvn:org.opendaylight.integration/\${FEATURE_TEST_STRING}/${BUNDLEVERSION}/xml/features,mvn:org.apache.karaf.decanter/apache-karaf-decanter/1.0.0/xml/features,%g" ${FEATURESCONF} +if [[ ! -z "${REPO_URL}" ]]; then + sed -ie "s%featuresRepositories =%featuresRepositories = ${REPO_URL},%g" ${FEATURESCONF} +fi cat ${FEATURESCONF} if [ "${ODL_ENABLE_L3_FWD}" == "yes" ]; then diff --git a/jjb/integration/integration-macros.yaml b/jjb/integration/integration-macros.yaml index c5c8125f66..3933b0cd98 100644 --- a/jjb/integration/integration-macros.yaml +++ b/jjb/integration/integration-macros.yaml @@ -27,6 +27,14 @@ default: '{bundle-url}' description: 'URL to karaf distribution zip' +- parameter: + name: integration-repo-url + parameters: + - string: + name: REPO_URL + default: '{repo-url}' + description: 'URL to feature repo artifact' + - parameter: name: integration-jdk-version parameters: diff --git a/jjb/integration/integration-templates.yaml b/jjb/integration/integration-templates.yaml index bac9e13d22..92db892344 100644 --- a/jjb/integration/integration-templates.yaml +++ b/jjb/integration/integration-templates.yaml @@ -56,6 +56,8 @@ stream: '{verify-stream}' - integration-bundle-url: bundle-url: '{bundle-url}' + - integration-repo-url: + repo-url: '{repo-url}' - integration-controller-scope: controller-scope: 'only' - integration-controller-features: @@ -146,6 +148,8 @@ stream: '{stream}' - integration-bundle-url: bundle-url: '{bundle-url}' + - integration-repo-url: + repo-url: '{repo-url}' - integration-controller-scope: controller-scope: '{scope}' - integration-controller-features: @@ -267,6 +271,8 @@ stream: '{stream}' - integration-bundle-url: bundle-url: '{bundle-url}' + - integration-repo-url: + repo-url: '{repo-url}' - integration-controller-scope: controller-scope: '{scope}' - integration-controller-features: @@ -495,6 +501,8 @@ stream: '{verify-stream}' - integration-bundle-url: bundle-url: '{bundle-url}' + - integration-repo-url: + repo-url: '{repo-url}' - integration-controller-scope: controller-scope: 'only' - integration-controller-features: @@ -588,6 +596,8 @@ stream: '{stream}' - integration-bundle-url: bundle-url: '{bundle-url}' + - integration-repo-url: + repo-url: '{repo-url}' - integration-controller-scope: controller-scope: '{scope}' - integration-controller-features: @@ -703,6 +713,8 @@ stream: '{stream}' - integration-bundle-url: bundle-url: '{bundle-url}' + - integration-repo-url: + repo-url: '{repo-url}' - integration-controller-scope: controller-scope: '{scope}' - integration-controller-features: @@ -818,6 +830,8 @@ stream: '{stream}' - integration-bundle-url: bundle-url: '{bundle-url}' + - integration-repo-url: + repo-url: '{repo-url}' - integration-controller-scope: controller-scope: '{scope}' - integration-controller-features: @@ -1048,6 +1062,8 @@ stream: '{stream}' - integration-bundle-url: bundle-url: '{bundle-url}' + - integration-repo-url: + repo-url: '{repo-url}' - integration-controller-features: controller-features: '{install-features}' - integration-controller-debug-map: @@ -1253,6 +1269,8 @@ stream: '{stream}' - integration-bundle-url: bundle-url: '{bundle-url}' + - integration-repo-url: + repo-url: '{repo-url}' - integration-controller-features: controller-features: '{install-features}' - integration-controller-debug-map: diff --git a/jjb/releng-defaults.yaml b/jjb/releng-defaults.yaml index cc31c2a77e..0e3ef318bf 100644 --- a/jjb/releng-defaults.yaml +++ b/jjb/releng-defaults.yaml @@ -67,6 +67,7 @@ # Distribution bundle URL bundle-url: 'last' + repo-url: '' # CSIT images configuration openstack_system_image_ocata: ZZCI - CentOS 7 - devstack-ocata - 20171208-1649 diff --git a/jjb/sxp/sxp-csit-basic.yaml b/jjb/sxp/sxp-csit-basic.yaml index 00cbb34b56..32f2fea771 100644 --- a/jjb/sxp/sxp-csit-basic.yaml +++ b/jjb/sxp/sxp-csit-basic.yaml @@ -16,7 +16,7 @@ branch: 'master' trigger-jobs: '{project}-merge-{stream}' # yamllint disable-line rule:line-length - bundle-url: 'https://jenkins.opendaylight.org/releng/view/sxp/job/sxp-merge-fluorine/lastBuild/org.opendaylight.sxp$sxp-karaf/artifact/org.opendaylight.sxp/sxp-karaf/1.7.0-SNAPSHOT/sxp-karaf-1.7.0-SNAPSHOT.zip' + repo-url: 'mvn:org.opendaylight.sxp/features-sxp/1.7.0-SNAPSHOT/xml/features' - oxygen: branch: 'stable/oxygen' - nitrogen: diff --git a/jjb/sxp/sxp-csit-cluster-routing.yaml b/jjb/sxp/sxp-csit-cluster-routing.yaml index 36f1dd602a..3f73956b42 100644 --- a/jjb/sxp/sxp-csit-cluster-routing.yaml +++ b/jjb/sxp/sxp-csit-cluster-routing.yaml @@ -16,7 +16,7 @@ branch: 'master' trigger-jobs: '{project}-merge-{stream}' # yamllint disable-line rule:line-length - bundle-url: 'https://jenkins.opendaylight.org/releng/view/sxp/job/sxp-merge-fluorine/lastBuild/org.opendaylight.sxp$sxp-karaf/artifact/org.opendaylight.sxp/sxp-karaf/1.7.0-SNAPSHOT/sxp-karaf-1.7.0-SNAPSHOT.zip' + repo-url: 'mvn:org.opendaylight.sxp/features-sxp/1.7.0-SNAPSHOT/xml/features' - oxygen: branch: 'stable/oxygen' - nitrogen: diff --git a/jjb/sxp/sxp-csit-clustering.yaml b/jjb/sxp/sxp-csit-clustering.yaml index e337efc73f..4ffc77f52c 100644 --- a/jjb/sxp/sxp-csit-clustering.yaml +++ b/jjb/sxp/sxp-csit-clustering.yaml @@ -16,7 +16,7 @@ branch: 'master' trigger-jobs: '{project}-merge-{stream}' # yamllint disable-line rule:line-length - bundle-url: 'https://jenkins.opendaylight.org/releng/view/sxp/job/sxp-merge-fluorine/lastBuild/org.opendaylight.sxp$sxp-karaf/artifact/org.opendaylight.sxp/sxp-karaf/1.7.0-SNAPSHOT/sxp-karaf-1.7.0-SNAPSHOT.zip' + repo-url: 'mvn:org.opendaylight.sxp/features-sxp/1.7.0-SNAPSHOT/xml/features' - oxygen: branch: 'stable/oxygen' - nitrogen: diff --git a/jjb/sxp/sxp-csit-filtering.yaml b/jjb/sxp/sxp-csit-filtering.yaml index 5325dea6d6..1c18ccd314 100644 --- a/jjb/sxp/sxp-csit-filtering.yaml +++ b/jjb/sxp/sxp-csit-filtering.yaml @@ -16,7 +16,7 @@ branch: 'master' trigger-jobs: '{project}-merge-{stream}' # yamllint disable-line rule:line-length - bundle-url: 'https://jenkins.opendaylight.org/releng/view/sxp/job/sxp-merge-fluorine/lastBuild/org.opendaylight.sxp$sxp-karaf/artifact/org.opendaylight.sxp/sxp-karaf/1.7.0-SNAPSHOT/sxp-karaf-1.7.0-SNAPSHOT.zip' + repo-url: 'mvn:org.opendaylight.sxp/features-sxp/1.7.0-SNAPSHOT/xml/features' - oxygen: branch: 'stable/oxygen' - nitrogen: diff --git a/jjb/sxp/sxp-csit-performance.yaml b/jjb/sxp/sxp-csit-performance.yaml index 377d24949a..19599a919c 100644 --- a/jjb/sxp/sxp-csit-performance.yaml +++ b/jjb/sxp/sxp-csit-performance.yaml @@ -16,7 +16,7 @@ branch: 'master' trigger-jobs: '{project}-merge-{stream}' # yamllint disable-line rule:line-length - bundle-url: 'https://jenkins.opendaylight.org/releng/view/sxp/job/sxp-merge-fluorine/lastBuild/org.opendaylight.sxp$sxp-karaf/artifact/org.opendaylight.sxp/sxp-karaf/1.7.0-SNAPSHOT/sxp-karaf-1.7.0-SNAPSHOT.zip' + repo-url: 'mvn:org.opendaylight.sxp/features-sxp/1.7.0-SNAPSHOT/xml/features' - oxygen: branch: 'stable/oxygen' - nitrogen: diff --git a/jjb/sxp/sxp-csit-topology.yaml b/jjb/sxp/sxp-csit-topology.yaml index 74147dfdde..28abaf89d3 100644 --- a/jjb/sxp/sxp-csit-topology.yaml +++ b/jjb/sxp/sxp-csit-topology.yaml @@ -16,7 +16,7 @@ branch: 'master' trigger-jobs: '{project}-merge-{stream}' # yamllint disable-line rule:line-length - bundle-url: 'https://jenkins.opendaylight.org/releng/view/sxp/job/sxp-merge-fluorine/lastBuild/org.opendaylight.sxp$sxp-karaf/artifact/org.opendaylight.sxp/sxp-karaf/1.7.0-SNAPSHOT/sxp-karaf-1.7.0-SNAPSHOT.zip' + repo-url: 'mvn:org.opendaylight.sxp/features-sxp/1.7.0-SNAPSHOT/xml/features' - oxygen: branch: 'stable/oxygen' - nitrogen: diff --git a/jjb/usc/usc-csit-channel.yaml b/jjb/usc/usc-csit-channel.yaml index 4c418656e2..a43ce024c7 100644 --- a/jjb/usc/usc-csit-channel.yaml +++ b/jjb/usc/usc-csit-channel.yaml @@ -17,7 +17,7 @@ branch: 'master' trigger-jobs: '{project}-merge-{stream}' # yamllint disable-line rule:line-length - bundle-url: 'https://jenkins.opendaylight.org/releng/view/usc/job/usc-merge-fluorine/lastBuild/org.opendaylight.usc$usc-karaf/artifact/org.opendaylight.usc/usc-karaf/1.6.0-SNAPSHOT/usc-karaf-1.6.0-SNAPSHOT.zip' + repo-url: 'mvn:org.opendaylight.usc/usc-features/1.6.0-SNAPSHOT/xml/features' - oxygen: branch: 'stable/oxygen' - nitrogen: diff --git a/jjb/usc/usc-csit-tcp.yaml b/jjb/usc/usc-csit-tcp.yaml index 46781e36cd..ca04c7f2d6 100644 --- a/jjb/usc/usc-csit-tcp.yaml +++ b/jjb/usc/usc-csit-tcp.yaml @@ -15,6 +15,8 @@ stream: - fluorine: branch: 'master' + # yamllint disable-line rule:line-length + repo-url: 'mvn:org.opendaylight.usc/usc-features/1.6.0-SNAPSHOT/xml/features' - oxygen: branch: 'stable/oxygen' - nitrogen: -- 2.36.6