From fad5792bd26bec7592c284e2c87c1634ea911baa Mon Sep 17 00:00:00 2001
From: "Jose R. Gonzalez" <jose@flutes.dev>
Date: Wed, 4 Jan 2023 10:55:45 -0600
Subject: [PATCH] allow configurable artifacts directory in e2e testing

Signed-off-by: Jose R. Gonzalez <jose@flutes.dev>
---
 .gitignore                               | 4 ++--
 test/e2e/operator-test-customized-env.sh | 2 +-
 test/e2e/operator-test.sh                | 8 +++++---
 3 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/.gitignore b/.gitignore
index 8ac5be191..c47fcf10a 100644
--- a/.gitignore
+++ b/.gitignore
@@ -33,8 +33,8 @@ sgol.txt
 
 # Testing dirs
 /artifacts
-# E2E customized env artifacts dir
-stcafitra/
+# E2E testing artifacts dir
+e2e_test_artifacts/
 
 # But we don't want to ignore the artifacts package
 !/certification/artifacts
diff --git a/test/e2e/operator-test-customized-env.sh b/test/e2e/operator-test-customized-env.sh
index 4881ad2ed..4d7dbe521 100755
--- a/test/e2e/operator-test-customized-env.sh
+++ b/test/e2e/operator-test-customized-env.sh
@@ -15,7 +15,7 @@ OPERATOR_INDEXIMAGE=${OPERATOR_INDEXIMAGE:-"$DEFAULT_OPERATOR_INDEXIMAGE"}
 customized_sa="customsa" \
 customized_ns="customns" \
 customized_logfile="sgol.txt" \
-customized_artifacts="stcafitra" \
+customized_artifacts="e2e_test_artifacts" \
 results_file="./${customized_artifacts}/results.json"
 
 
diff --git a/test/e2e/operator-test.sh b/test/e2e/operator-test.sh
index fca9a4c9b..ab2aebb52 100755
--- a/test/e2e/operator-test.sh
+++ b/test/e2e/operator-test.sh
@@ -5,13 +5,14 @@ set -e
 DEFAULT_PREFLIGHT_BIN="preflight"
 DEFAULT_OPERATOR_BUNDLE="quay.io/opdev/simple-demo-operator-bundle:latest"
 DEFAULT_OPERATOR_INDEXIMAGE="quay.io/opdev/simple-demo-operator-catalog:latest"
+DEFAULT_ARTIFACTS_DIR="e2e_test_artifacts"
 
 PREFLIGHT_BIN=${PREFLIGHT_BIN:-"$DEFAULT_PREFLIGHT_BIN"}
 OPERATOR_BUNDLE=${OPERATOR_BUNDLE:-"$DEFAULT_OPERATOR_BUNDLE"}
 OPERATOR_INDEXIMAGE=${OPERATOR_INDEXIMAGE:-"$DEFAULT_OPERATOR_INDEXIMAGE"}
+ARTIFACTS_DIR=${ARTIFACTS_DIR:-"$DEFAULT_ARTIFACTS_DIR"}
 
-results_file="./artifacts/results.json"
-
+results_file="./${ARTIFACTS_DIR}/results.json"
 
  USAGE=" 
  Usage: 
@@ -45,11 +46,12 @@ results_file="./artifacts/results.json"
 echo "Preflight binary value: $PREFLIGHT_BIN"
 echo "Operator bundle being tested: $OPERATOR_BUNDLE"
 echo "Operator index for test: $OPERATOR_INDEXIMAGE"
+echo "Artifacts directory for test: $ARTIFACTS_DIR"
 
 # Run preflight.
 echo "Running preflight"
 echo -e "========================"
-PFLT_LOGLEVEL=trace PFLT_INDEXIMAGE="${OPERATOR_INDEXIMAGE}" \
+PFLT_LOGLEVEL=trace PFLT_INDEXIMAGE="${OPERATOR_INDEXIMAGE}" PFLT_ARTIFACTS="${ARTIFACTS_DIR}" \
     "./${PREFLIGHT_BIN}" check operator "${OPERATOR_BUNDLE}"
 
 echo -e "\n========================"