From: Thanh Ha (zxiiro) Date: Mon, 7 Jan 2019 14:41:42 +0000 (+0000) Subject: Merge "Update build URLs for RPM tests" X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=commitdiff_plain;h=8d035d931b5f752d4bd18a29a122886965042c8b;hp=db081f682b8f7e8cba5a04ac536aaa1d6aa5bc35;p=releng%2Fbuilder.git Merge "Update build URLs for RPM tests" --- diff --git a/jjb/integration/distribution/distribution-jobs.yaml b/jjb/integration/distribution/distribution-jobs.yaml index 9c2b14ea3..004b1e796 100644 --- a/jjb/integration/distribution/distribution-jobs.yaml +++ b/jjb/integration/distribution/distribution-jobs.yaml @@ -25,30 +25,19 @@ # Self-Managed projects repos and features: sm-repos: > mvn:org.opendaylight.sxp/features-sxp//xml/features, - mvn:org.opendaylight.telemetry/features-telemetry//xml/features, - mvn:org.opendaylight.tsdr/features-tsdr//xml/features + mvn:org.opendaylight.telemetry/features-telemetry//xml/features sm-features: > odl-sxp-routing, odl-telemetry-collector, odl-telemetry-configurator, - odl-telemetry-all, - odl-tsdr-core, - odl-tsdr-openflow-statistics-collector, - odl-tsdr-netflow-statistics-collector, - odl-tsdr-restconf-collector, - odl-tsdr-syslog-collector, - odl-tsdr-controller-metrics-collector, - odl-tsdr-cassandra, - odl-tsdr-hbase, - odl-tsdr-hsqldb, - odl-tsdr-elasticsearch + odl-telemetry-all - fluorine: branch: 'stable/fluorine' karaf-version: odl # Self-Managed projects repos and features: sm-repos: > mvn:org.opendaylight.sxp/features-sxp//xml/features, - mvn:org.opendaylight.transportpce/features-transportpce//xml/features, + mvn:org.opendaylight.transportpce/features-transportpce//xml/features sm-features: > odl-sxp-routing, odl-transportpce, @@ -188,7 +177,7 @@ sxp-merge-{stream}, telemetry-merge-{stream}, tsdr-merge-{stream}, - unimgr-merge-{stream}, + unimgr-merge-{stream} - fluorine: branch: 'stable/fluorine' karaf-version: odl @@ -198,7 +187,7 @@ sxp-merge-{stream}, transportpce-merge-{stream}, tsdr-merge-{stream}, - unimgr-merge-{stream}, + unimgr-merge-{stream} - project: name: distribution-release diff --git a/jjb/integration/integration-test-jobs.yaml b/jjb/integration/integration-test-jobs.yaml index 40475f69a..b1b6c24d7 100644 --- a/jjb/integration/integration-test-jobs.yaml +++ b/jjb/integration/integration-test-jobs.yaml @@ -196,6 +196,11 @@ BUNDLE_URL=$BUNDLE_URL KARAF_VERSION=$KARAF_VERSION + wrappers: + - lf-infra-wrappers: + build-timeout: 1440 + jenkins-ssh-credential: '{jenkins-ssh-credential}' + publishers: - opendaylight-infra-generate-csit-status-report - email-notification: diff --git a/jjb/integration/multipatch-distribution.sh b/jjb/integration/multipatch-distribution.sh index 82220dff3..eac630698 100755 --- a/jjb/integration/multipatch-distribution.sh +++ b/jjb/integration/multipatch-distribution.sh @@ -5,12 +5,13 @@ set -e # create a fresh empty place to build this custom distribution BUILD_DIR=${WORKSPACE}/patch_tester DISTRIBUTION_BRANCH_TO_BUILD=$DISTROBRANCH #renaming variable for clarity -MAVEN_OPTIONS="$(echo --show-version \ +MAVEN_OPTIONS="${MAVEN_PARAMS} \ + --show-version \ --batch-mode \ -Djenkins \ -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn \ -Dmaven.repo.local=/tmp/r \ - -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r)" + -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r" rm -rf $BUILD_DIR mkdir -p $BUILD_DIR @@ -180,10 +181,10 @@ if [[ -d "odlparent" ]]; then fi fi if [[ -d "yangtools" ]]; then - if [[ -d "mdsal" ]]; then + if [[ -d "mdsal" ]]; then # Extract patch and MSI used version patch_version="$(xpath ./yangtools/pom.xml '/project/version/text()' 2> /dev/null)" - msi_version="$(xpath ./mdsal/binding/yang-binding/pom.xml '/project/dependencyManagement/dependencies/dependency/version/text()' 2> /dev/null)" + msi_version="$(xpath ./mdsal/dom/dom-parent/pom.xml '/project/dependencyManagement/dependencies/dependency[artifactId="yangtools-artifacts"]/version/text()' 2> /dev/null)" # Replace version find ./yangtools -name "*.xml" -print0 | xargs -0 sed -i "s/${patch_version}/${msi_version}/g" else diff --git a/jjb/sxp/sxp-csit-basic.yaml b/jjb/sxp/sxp-csit-basic.yaml index 3cb0856e0..c137ab7b6 100644 --- a/jjb/sxp/sxp-csit-basic.yaml +++ b/jjb/sxp/sxp-csit-basic.yaml @@ -17,13 +17,13 @@ trigger-jobs: '{project}-merge-{stream}' karaf-version: 'odl' # yamllint disable-line rule:line-length - repo-url: 'mvn:org.opendaylight.sxp/features-sxp//xml/features' + repo-url: 'mvn:org.opendaylight.sxp/features-sxp/1.8.0-SNAPSHOT/xml/features' - fluorine: branch: 'stable/fluorine' trigger-jobs: '{project}-merge-{stream}' karaf-version: 'odl' # yamllint disable-line rule:line-length - repo-url: 'mvn:org.opendaylight.sxp/features-sxp//xml/features' + repo-url: 'mvn:org.opendaylight.sxp/features-sxp/1.7.2-SNAPSHOT/xml/features' - oxygen: branch: 'stable/oxygen' diff --git a/jjb/sxp/sxp-csit-binding-origin.yaml b/jjb/sxp/sxp-csit-binding-origin.yaml index a46a8d1a4..3fe2e5be5 100644 --- a/jjb/sxp/sxp-csit-binding-origin.yaml +++ b/jjb/sxp/sxp-csit-binding-origin.yaml @@ -17,13 +17,13 @@ trigger-jobs: '{project}-merge-{stream}' karaf-version: 'odl' # yamllint disable-line rule:line-length - repo-url: 'mvn:org.opendaylight.sxp/features-sxp//xml/features' + repo-url: 'mvn:org.opendaylight.sxp/features-sxp/1.8.0-SNAPSHOT/xml/features' - fluorine: branch: 'stable/fluorine' trigger-jobs: '{project}-merge-{stream}' karaf-version: 'odl' # yamllint disable-line rule:line-length - repo-url: 'mvn:org.opendaylight.sxp/features-sxp//xml/features' + repo-url: 'mvn:org.opendaylight.sxp/features-sxp/1.7.2-SNAPSHOT/xml/features' install: - all: diff --git a/jjb/sxp/sxp-csit-cluster-routing.yaml b/jjb/sxp/sxp-csit-cluster-routing.yaml deleted file mode 100644 index 723c3e4a2..000000000 --- a/jjb/sxp/sxp-csit-cluster-routing.yaml +++ /dev/null @@ -1,41 +0,0 @@ ---- -- project: - name: sxp-csit-routing - jobs: - - inttest-csit-3node - - # The project name - project: 'sxp' - - # The functionality under test - functionality: 'routing' - - # Project branches - stream: - - neon: - branch: 'master' - trigger-jobs: '{project}-merge-{stream}' - karaf-version: 'odl' - # yamllint disable-line rule:line-length - repo-url: 'mvn:org.opendaylight.sxp/features-sxp//xml/features' - - fluorine: - branch: 'stable/fluorine' - trigger-jobs: '{project}-merge-{stream}' - karaf-version: 'odl' - # yamllint disable-line rule:line-length - repo-url: 'mvn:org.opendaylight.sxp/features-sxp//xml/features' - - oxygen: - branch: 'stable/oxygen' - - install: - - all: - scope: 'all' - - # Features to install - install-features: 'odl-restconf,odl-sxp-controller,odl-sxp-routing' - - # Tools VMs: - tools_system_count: 2 - - # Robot custom options: - robot-options: '' diff --git a/jjb/sxp/sxp-csit-clustering.yaml b/jjb/sxp/sxp-csit-clustering.yaml index 700753c24..781ba19c3 100644 --- a/jjb/sxp/sxp-csit-clustering.yaml +++ b/jjb/sxp/sxp-csit-clustering.yaml @@ -17,13 +17,13 @@ trigger-jobs: '{project}-merge-{stream}' karaf-version: 'odl' # yamllint disable-line rule:line-length - repo-url: 'mvn:org.opendaylight.sxp/features-sxp//xml/features' + repo-url: 'mvn:org.opendaylight.sxp/features-sxp/1.8.0-SNAPSHOT/xml/features' - fluorine: branch: 'stable/fluorine' trigger-jobs: '{project}-merge-{stream}' karaf-version: 'odl' # yamllint disable-line rule:line-length - repo-url: 'mvn:org.opendaylight.sxp/features-sxp//xml/features' + repo-url: 'mvn:org.opendaylight.sxp/features-sxp/1.7.2-SNAPSHOT/xml/features' - oxygen: branch: 'stable/oxygen' diff --git a/jjb/sxp/sxp-csit-filtering.yaml b/jjb/sxp/sxp-csit-filtering.yaml index 9bd243f7b..a443ff176 100644 --- a/jjb/sxp/sxp-csit-filtering.yaml +++ b/jjb/sxp/sxp-csit-filtering.yaml @@ -17,13 +17,13 @@ trigger-jobs: '{project}-merge-{stream}' karaf-version: 'odl' # yamllint disable-line rule:line-length - repo-url: 'mvn:org.opendaylight.sxp/features-sxp//xml/features' + repo-url: 'mvn:org.opendaylight.sxp/features-sxp/1.8.0-SNAPSHOT/xml/features' - fluorine: branch: 'stable/fluorine' trigger-jobs: '{project}-merge-{stream}' karaf-version: 'odl' # yamllint disable-line rule:line-length - repo-url: 'mvn:org.opendaylight.sxp/features-sxp//xml/features' + repo-url: 'mvn:org.opendaylight.sxp/features-sxp/1.7.2-SNAPSHOT/xml/features' - oxygen: branch: 'stable/oxygen' diff --git a/jjb/sxp/sxp-csit-performance.yaml b/jjb/sxp/sxp-csit-performance.yaml index be41e1948..b02734dfa 100644 --- a/jjb/sxp/sxp-csit-performance.yaml +++ b/jjb/sxp/sxp-csit-performance.yaml @@ -17,13 +17,13 @@ trigger-jobs: '{project}-merge-{stream}' karaf-version: 'odl' # yamllint disable-line rule:line-length - repo-url: 'mvn:org.opendaylight.sxp/features-sxp//xml/features' + repo-url: 'mvn:org.opendaylight.sxp/features-sxp/1.8.0-SNAPSHOT/xml/features' - fluorine: branch: 'stable/fluorine' trigger-jobs: '{project}-merge-{stream}' karaf-version: 'odl' # yamllint disable-line rule:line-length - repo-url: 'mvn:org.opendaylight.sxp/features-sxp//xml/features' + repo-url: 'mvn:org.opendaylight.sxp/features-sxp/1.7.2-SNAPSHOT/xml/features' - oxygen: branch: 'stable/oxygen' diff --git a/jjb/sxp/sxp-csit-topology.yaml b/jjb/sxp/sxp-csit-topology.yaml index 55bec1ec2..ed1806bab 100644 --- a/jjb/sxp/sxp-csit-topology.yaml +++ b/jjb/sxp/sxp-csit-topology.yaml @@ -17,13 +17,13 @@ trigger-jobs: '{project}-merge-{stream}' karaf-version: 'odl' # yamllint disable-line rule:line-length - repo-url: 'mvn:org.opendaylight.sxp/features-sxp//xml/features' + repo-url: 'mvn:org.opendaylight.sxp/features-sxp/1.8.0-SNAPSHOT/xml/features' - fluorine: branch: 'stable/fluorine' trigger-jobs: '{project}-merge-{stream}' karaf-version: 'odl' # yamllint disable-line rule:line-length - repo-url: 'mvn:org.opendaylight.sxp/features-sxp//xml/features' + repo-url: 'mvn:org.opendaylight.sxp/features-sxp/1.7.2-SNAPSHOT/xml/features' - oxygen: branch: 'stable/oxygen' diff --git a/jjb/yangtools/yangtools.yaml b/jjb/yangtools/yangtools.yaml index 73e939660..c99554fd9 100644 --- a/jjb/yangtools/yangtools.yaml +++ b/jjb/yangtools/yangtools.yaml @@ -87,6 +87,7 @@ mvn-params: > -Dodl.jacoco.aggregateFile=$WORKSPACE/target/jacoco.exec -Dsonar.jacoco.reportPath=$WORKSPACE/target/jacoco.exec + -Dskip.karaf.featureTest=true project: 'yangtools' project-name: 'yangtools'