Merge pull request #21 from cloud-gov/cw6

Remove last hard coding of release version for acceptance tests
cloud-gov · May 7, 2024 · ed63a0b · ed63a0b
2 parents fda36d1 + 33500ae
commit ed63a0b
Show file tree

Hide file tree

Showing 3 changed files with 30 additions and 4 deletions.
diff --git a/ci/acceptance-tests.sh b/ci/acceptance-tests.sh
@@ -4,13 +4,11 @@ set -eu
 echo "######################################################################"
 echo "This is the installed go version: $(go version)"
 echo "This is the installed cf cli version: $(cf -v)"
-echo "This is the ACCEPTANCE_TESTS_VERSION version: ${ACCEPTANCE_TESTS_VERSION}"
 echo "######################################################################"
 
 # Get the tarball with the test
-wget -O app-autoscaler-acceptance-tests.tgz  https://github.com/cloudfoundry/app-autoscaler-release/releases/download/v${ACCEPTANCE_TESTS_VERSION}/app-autoscaler-acceptance-tests-v${ACCEPTANCE_TESTS_VERSION}.tgz
-tar -xzf app-autoscaler-acceptance-tests.tgz 
-
+cd release
+tar -xzf app-autoscaler-acceptance*.tgz
 cd acceptance
 
 if [[ "$COMPONENT_TO_TEST" = "app" ]]; then 

diff --git a/ci/acceptance-tests.yml b/ci/acceptance-tests.yml
@@ -12,6 +12,7 @@ image_resource:
 
 inputs:
 - name: autoscaler-manifests
+- name: release
 outputs:
 - name: acceptance-tests-output      #Placeholder, not sure if needed yet
 

diff --git a/ci/pipeline.yml b/ci/pipeline.yml
@@ -153,6 +153,9 @@ jobs:
     - get: autoscaler-manifests
       trigger: true
       passed: [deploy-as-development]
+    - get: release
+      passed: [deploy-as-development]
+      trigger: true
   - task: acceptance-tests
     file: autoscaler-manifests/ci/acceptance-tests.yml
     params:
@@ -192,6 +195,9 @@ jobs:
     - get: autoscaler-manifests
       trigger: true
       passed: [deploy-as-development] 
+    - get: release
+      passed: [deploy-as-development]
+      trigger: true
   - task: acceptance-tests
     file: autoscaler-manifests/ci/acceptance-tests.yml
     params:
@@ -231,6 +237,9 @@ jobs:
     - get: autoscaler-manifests
       trigger: true
       passed: [deploy-as-development] 
+    - get: release
+      passed: [deploy-as-development]
+      trigger: true
   - task: acceptance-tests
     file: autoscaler-manifests/ci/acceptance-tests.yml
     params:
@@ -354,6 +363,9 @@ jobs:
     - get: autoscaler-manifests
       trigger: true
       passed: [deploy-as-staging]
+    - get: release
+      passed: [deploy-as-staging]
+      trigger: true
   - task: acceptance-tests
     file: autoscaler-manifests/ci/acceptance-tests.yml
     params:
@@ -392,6 +404,9 @@ jobs:
     - get: autoscaler-manifests
       trigger: true
       passed: [deploy-as-staging] 
+    - get: release
+      passed: [deploy-as-staging]
+      trigger: true
   - task: acceptance-tests
     file: autoscaler-manifests/ci/acceptance-tests.yml
     params:
@@ -430,6 +445,9 @@ jobs:
     - get: autoscaler-manifests
       trigger: true
       passed: [deploy-as-staging] 
+    - get: release
+      passed: [deploy-as-staging]
+      trigger: true
   - task: acceptance-tests
     file: autoscaler-manifests/ci/acceptance-tests.yml
     params:
@@ -552,6 +570,9 @@ jobs:
     - get: autoscaler-manifests
       trigger: true
       passed: [deploy-as-production]
+    - get: release
+      passed: [deploy-as-production]
+      trigger: true
   - task: acceptance-tests
     file: autoscaler-manifests/ci/acceptance-tests.yml
     params:
@@ -590,6 +611,9 @@ jobs:
     - get: autoscaler-manifests
       trigger: true
       passed: [deploy-as-production] 
+    - get: release
+      passed: [deploy-as-production]
+      trigger: true
   - task: acceptance-tests
     file: autoscaler-manifests/ci/acceptance-tests.yml
     params:
@@ -628,6 +652,9 @@ jobs:
     - get: autoscaler-manifests
       trigger: true
       passed: [deploy-as-production] 
+    - get: release
+      passed: [deploy-as-production]
+      trigger: true
   - task: acceptance-tests
     file: autoscaler-manifests/ci/acceptance-tests.yml
     params: