Travis: fix dgoss, goss install

behance · Dec 17, 2021 · a2bab27 · a2bab27
1 parent 9515e91
commit a2bab27
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 6 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -1,10 +1,13 @@
 sudo: required
 
 env:
-  - PHP_VARIANT=7.4-alpine
-  - PHP_VARIANT=7.4
-  - PHP_VARIANT=8.0
-  - PHP_VARIANT=8.1
+  global:
+    - GOSS_INSTALL_PATH="./"
+  jobs:
+    - PHP_VARIANT=7.4-alpine
+    - PHP_VARIANT=7.4
+    - PHP_VARIANT=8.0
+    - PHP_VARIANT=8.1
 
 services:
   - docker

diff --git a/test.sh b/test.sh
@@ -72,6 +72,7 @@ function finish {
 
   # Remove the tag if it exists
   docker rmi -f $BUILD_SHA 2>&1 > /dev/null
+  rm ./$TAG_NAME
 }
 
 trap finish EXIT
@@ -93,12 +94,12 @@ echo "${PREFIX} Perform startup tests"
 GOSS_PATH=goss \
 GOSS_SLEEP=5 \
 GOSS_FILES_PATH="runtime-tests/startup/${PHP_VARIANT}/" \
-dgoss run --rm $BUILD_SHA
+"${GOSS_INSTALL_PATH}dgoss" run --rm $BUILD_SHA
 
 echo "${PREFIX} Perform NewRelic runtime tests"
 GOSS_PATH=goss \
 GOSS_FILES_PATH="runtime-tests/newrelic/${PHP_VARIANT}/" \
-dgoss run \
+"${GOSS_INSTALL_PATH}dgoss" run \
   -e REPLACE_NEWRELIC_APP="abcdefg" \
   -e REPLACE_NEWRELIC_LICENSE="hijklmno" \
   -e NEWRELIC_TRACING_ENABLED="true" \