Support validating tar files by skipping the Docker pull if the image is local. Skip the Docker validations in the run-smoke-tests.sh script altogether to rely on the e2e-tests. Increase validation time to 30 minutes.

Signed-off-by: David Venable <[email protected]>

Author: dlvenable

.github/workflows/release.yml

@@ -97,7 +97,7 @@ jobs:
       fail-fast: false
     runs-on: ubuntu-latest
     needs: build
-    timeout-minutes: 8
+    timeout-minutes: 30
 
     steps:
       - name: Checkout Data Prepper

e2e-test/build.gradle

@@ -85,7 +85,9 @@ subprojects {
 
     tasks.register('dataPrepperDockerImage', DockerProviderTask) {
         if(dataPrepperDefinedDockerImage != null) {
-            dependsOn 'pullDataPrepperDockerImage'
+            if(dataPrepperDefinedDockerImage.contains('/')) {
+                dependsOn 'pullDataPrepperDockerImage'
+            }
             imageId = "${dataPrepperDefinedDockerImage}"
         }
         else if(targetJavaVersion == 'docker') {

release/smoke-tests/run-smoke-tests.sh

@@ -56,14 +56,6 @@ done
 
 export DOCKER_IMAGE="${IMAGE_NAME}:${TAG_NAME}"
 
-# Check the Docker image before running
-if ! docker inspect --type=image "${DOCKER_IMAGE}" > /dev/null
-then
-    echo "--------------------------------------------------------------------------"
-    echo "Unable to find image \"${DOCKER_IMAGE}\" are you sure it exists?"
-    end_tests 1
-fi
-
 echo "Will smoke test image \"${DOCKER_IMAGE}\""
 
 ./gradlew -PendToEndDataPrepperImage=${IMAGE_NAME} -PendToEndDataPrepperTag=${TAG_NAME} :e2e-test:log:basicLogEndToEndTest