Revert "Save infra resources"

This reverts commit fa39e8f8dd2a6c820abfb33ece6252eddb348c16.

Change-Id: I1af3b89aa8b2c8bb7f39aa3719a22df89f69e646
Signed-off-by: Jamo Luhrsen <jluhrsen@redhat.com>

diff --git a/jjb/autorelease/autorelease-templates.yaml b/jjb/autorelease/autorelease-templates.yaml
index fe0efceb474d182af3e273e15ae9ca5746233db1..a54d5c64f9dd74c20e69c40d33fe609b2670ec91 100644 (file)
--- a/jjb/autorelease/autorelease-templates.yaml
+++ b/jjb/autorelease/autorelease-templates.yaml
@@ -188,8 +188,12 @@
       - opendaylight-infra-notify-status
       - trigger-parameterized-builds:
           - project: 'integration-distribution-test-{integration-test}'
-            condition: STABLE
-            predefined-parameters: BUNDLE_URL=autorelease
+            condition: UNSTABLE_OR_BETTER
+            property-file: variables.jenkins-trigger
+            fail-on-missing: true
+          - project: 'integration-distribution-test-{integration-test}'
+            condition: FAILED
+            trigger-with-no-params: true
           - project: 'packaging-build-rpm-{stream}'
             condition: UNSTABLE_OR_BETTER
             predefined-parameters: DOWNLOAD_URL=$BUNDLE_URL

diff --git a/jjb/integration/integration-detect-variables.sh b/jjb/integration/integration-detect-variables.sh
index 66e2df0d004c42426f923dec0f0fff18c8e03eef..961df7bcbbe0aef28812847bec6d446a3224af07 100644 (file)
--- a/jjb/integration/integration-detect-variables.sh
+++ b/jjb/integration/integration-detect-variables.sh
@@ -24,15 +24,7 @@ if [ ${BUNDLE_URL} == 'last' ]; then
     BUNDLEFOLDER="${KARAF_ARTIFACT}-${BUNDLE_VERSION}"
     BUNDLE="${KARAF_ARTIFACT}-${TIMESTAMP}.zip"
     ACTUAL_BUNDLE_URL="${NEXUSPATH}/${BUNDLE_VERSION}/${BUNDLE}"
-elif [ ${BUNDLE_URL} == 'autorelease' ]; then
-    # Use latest stable AR job distribution URL
-    ACTUAL_BUNDLE_URL="$(curl -sL -X GET -H 'Accept:text/plain' https://jenkins.opendaylight.org/releng/view/autorelease/job/autorelease-release-$DISTROSTREAM/lastStableBuild/injectedEnvVars/export | grep BUNDLE_URL | tr -d 'BUNDLE_URL=')"
-    BUNDLE="${ACTUAL_BUNDLE_URL##*/}"
-    ARTIFACT="$(basename "$(dirname "$(dirname "${ACTUAL_BUNDLE_URL}")")")"
-    BUNDLE_VERSION="$(basename "$(dirname "${ACTUAL_BUNDLE_URL}")")"
-    BUNDLEFOLDER="${ARTIFACT}-${BUNDLE_VERSION}"
 else
-    # Use provided BUNDLE_URL
     ACTUAL_BUNDLE_URL="${BUNDLE_URL}"
     BUNDLE="${BUNDLE_URL##*/}"
     ARTIFACT="$(basename "$(dirname "$(dirname "${BUNDLE_URL}")")")"

diff --git a/jjb/integration/integration-macros.yaml b/jjb/integration/integration-macros.yaml
index 5a1922fb17acdc84076aa1b066c54d6d4fa5c280..b9e448a037128fde0800b03266154778bb5bc2a8 100644 (file)
--- a/jjb/integration/integration-macros.yaml
+++ b/jjb/integration/integration-macros.yaml
@@ -76,9 +76,7 @@
       - string:
           name: BUNDLE_URL
           default: '{bundle-url}'
-          description: |
-              Karaf distribution zip URL. Use last for last distribution in Nexus,
-              use autorelease for last stable AR job distribution.
+          description: 'URL to karaf distribution zip'
 
 - parameter:
     name: integration-repo-url

diff --git a/jjb/integration/integration-test-jobs.yaml b/jjb/integration/integration-test-jobs.yaml
index 660144e2fa0116173278451302997d1416235d2e..b1b6c24d74f9c3cd2ef342cdfd9ebc3925d511ec 100644 (file)
--- a/jjb/integration/integration-test-jobs.yaml
+++ b/jjb/integration/integration-test-jobs.yaml
@@ -183,22 +183,17 @@
           build-days-to-keep: '{build-days-to-keep}'
 
     parameters:
-      - integration-distribution-branch:
-          branch: '{branch}'
-      - integration-distribution-stream:
-          stream: '{stream}'
       - integration-bundle-url:
           bundle-url: '{bundle-url}'
       - distribution-karaf-version:
           karaf-version: '{karaf-version}'
 
     builders:
-      - integration-detect-variables
       - trigger-builds:
           - project: '{csit-list}'
             block: true
             predefined-parameters: |
-              BUNDLE_URL=$ACTUAL_BUNDLE_URL
+              BUNDLE_URL=$BUNDLE_URL
               KARAF_VERSION=$KARAF_VERSION
 
     wrappers: