diff --git a/.github/workflows/validations.yaml b/.github/workflows/validations.yaml index c6eedf9a5..5be852fa7 100644 --- a/.github/workflows/validations.yaml +++ b/.github/workflows/validations.yaml @@ -311,7 +311,7 @@ jobs: id: go-cache uses: actions/cache@v2.1.3 with: - path: /tmp/image.tar + path: image.tar key: ${{ runner.os }}-${{ hashFiles('test/acceptance/mac.sh') }} - name: Run Acceptance Tests (Mac) diff --git a/test/acceptance/mac.sh b/test/acceptance/mac.sh index b55a488f7..ca1d939ae 100755 --- a/test/acceptance/mac.sh +++ b/test/acceptance/mac.sh @@ -7,7 +7,7 @@ ACC_DIR=$2 TEST_IMAGE=$3 RESULTSDIR=$4 -TEST_IMAGE_TAR=/tmp/image.tar +TEST_IMAGE_TAR=image.tar TEST_TYPE=mac WORK_DIR=`mktemp -d -t "syft-acceptance-test-${TEST_TYPE}-XXXXXX"` NORMAL_TEST_IMAGE=$(echo ${TEST_IMAGE} | tr ':' '-' ) @@ -29,18 +29,20 @@ function cleanup { trap cleanup EXIT -# install skopeo -skopeo --version || brew install skopeo - # fetch test image -[[ -f ${TEST_IMAGE_TAR} ]] || skopeo --override-os linux copy "docker://docker.io/${TEST_IMAGE}" "docker-archive:${TEST_IMAGE_TAR}" -ls -alh ${TEST_IMAGE_TAR} +if [[ -f ${TEST_IMAGE_TAR} ]] +then + echo "using existing image" +else + skopeo --version || brew install skopeo + skopeo --override-os linux copy "docker://docker.io/${TEST_IMAGE}" "docker-archive:${TEST_IMAGE_TAR}" +fi # run syft SYFT_PATH="${DISTDIR}/syft-macos_darwin_amd64/syft" chmod 755 "${SYFT_PATH}" "${SYFT_PATH}" version -SYFT_CHECK_FOR_APP_UPDATE=0 "${SYFT_PATH}" packages docker-archive://${TEST_IMAGE_TAR} -vv -o json > "${REPORT}" +SYFT_CHECK_FOR_APP_UPDATE=0 "${SYFT_PATH}" packages docker-archive:${TEST_IMAGE_TAR} -vv -o json > "${REPORT}" # keep the generated report around mkdir -p ${RESULTSDIR}