From 61be65ce82ea69a3e6dbd34b597fdfd1af3ef794 Mon Sep 17 00:00:00 2001 From: Matthias Pohl Date: Wed, 20 Dec 2023 23:15:02 +0100 Subject: [PATCH] Reverts cache_docker_images.sh --- .github/workflows/template.flink-ci.yml | 8 ++++---- tools/azure-pipelines/cache_docker_images.sh | 8 -------- 2 files changed, 4 insertions(+), 12 deletions(-) diff --git a/.github/workflows/template.flink-ci.yml b/.github/workflows/template.flink-ci.yml index f473af1a3d2450..c0ac9f8490cc28 100644 --- a/.github/workflows/template.flink-ci.yml +++ b/.github/workflows/template.flink-ci.yml @@ -217,7 +217,7 @@ jobs: - name: "Load Docker images if not present in cache, yet" if: ${{ !cancelled() && !steps.docker-cache.cache.hit }} - run: ./tools/azure-pipelines/cache_docker_images.sh -f ${{ env.DOCKER_IMAGES_CACHE_FOLDER }} load + run: ./tools/azure-pipelines/cache_docker_images.sh load - name: "Test - ${{ matrix.module }}" id: test-run @@ -245,7 +245,7 @@ jobs: - name: "Save Docker images to cache" if: ${{ !cancelled() && (failure() || !steps.docker-cache.cache.hit) }} - run: ./tools/azure-pipelines/cache_docker_images.sh -f ${{ env.DOCKER_IMAGES_CACHE_FOLDER }} save + run: ./tools/azure-pipelines/cache_docker_images.sh save e2e-prereq-check: name: "Check: Code modified" @@ -360,7 +360,7 @@ jobs: - name: "Load Docker images if not present in Cache, yet" if: ${{ !cancelled() && !steps.docker-cache.cache.hit }} - run: ./tools/azure-pipelines/cache_docker_images.sh -f ${{ env.DOCKER_IMAGES_CACHE_FOLDER }} load + run: ./tools/azure-pipelines/cache_docker_images.sh load - name: "Build Flink" run: ${{ inputs.environment }} ./tools/ci/validate.sh "install -DskipTests -Dfast $PROFILE -Pskip-webui-build" @@ -388,4 +388,4 @@ jobs: - name: "Save Docker images to Cache" if: ${{ !cancelled() && (failure() || !steps.docker-cache.cache.hit) }} - run: ./tools/azure-pipelines/cache_docker_images.sh -f ${{ env.DOCKER_IMAGES_CACHE_FOLDER }} save + run: ./tools/azure-pipelines/cache_docker_images.sh save diff --git a/tools/azure-pipelines/cache_docker_images.sh b/tools/azure-pipelines/cache_docker_images.sh index 7ac2895169ac47..adbf155b80375e 100755 --- a/tools/azure-pipelines/cache_docker_images.sh +++ b/tools/azure-pipelines/cache_docker_images.sh @@ -21,14 +21,6 @@ # includes testcontainer images, kafka, elasticearch, etc. # -while getopts "f:" o; do - case "${o}" in - f) - DOCKER_IMAGES_CACHE_FOLDER=${OPTARG};; - esac -done -shift $((OPTIND-1)) - if [ -z "${DOCKER_IMAGES_CACHE_FOLDER:-}" ] then echo "\$DOCKER_IMAGES_CACHE_FOLDER must be set to cache the testing docker images. Exiting"