From fce81afeeb9ef8b390e5d4a53189a22902445fc6 Mon Sep 17 00:00:00 2001 From: Rabin Yasharzadehe Date: Thu, 9 May 2024 20:04:21 +0300 Subject: [PATCH 1/3] Increase test time limit Signed-off-by: Rabin Yasharzadehe --- .../interop-tests-cnv-tests-e2e-deploy-commands.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ci-operator/step-registry/interop-tests/cnv-tests-e2e-deploy/interop-tests-cnv-tests-e2e-deploy-commands.sh b/ci-operator/step-registry/interop-tests/cnv-tests-e2e-deploy/interop-tests-cnv-tests-e2e-deploy-commands.sh index 1d33af8028ce..8b761e8e1c79 100644 --- a/ci-operator/step-registry/interop-tests/cnv-tests-e2e-deploy/interop-tests-cnv-tests-e2e-deploy-commands.sh +++ b/ci-operator/step-registry/interop-tests/cnv-tests-e2e-deploy/interop-tests-cnv-tests-e2e-deploy-commands.sh @@ -40,7 +40,7 @@ FINISH_TIME=$(date "+%s") DIFF_TIME=$((FINISH_TIME-START_TIME)) set +x -if [[ ${DIFF_TIME} -le 600 ]]; then +if [[ ${DIFF_TIME} -le 720 ]]; then echo "" echo " 🚨 The tests finished too quickly (took only: ${DIFF_TIME} sec), pausing here to give us time to debug" echo " 😴 😴 😴" From 9bc7128b8ebde89958114bbcc2428437ecb9ff2f Mon Sep 17 00:00:00 2001 From: Rabin Yasharzadehe Date: Sun, 12 May 2024 16:05:09 +0300 Subject: [PATCH 2/3] Set OCS bin folder Signed-off-by: Rabin Yasharzadehe --- .../ocs-tests/interop-tests-ocs-tests-commands.sh | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/ci-operator/step-registry/interop-tests/ocs-tests/interop-tests-ocs-tests-commands.sh b/ci-operator/step-registry/interop-tests/ocs-tests/interop-tests-ocs-tests-commands.sh index ec73cd0d713f..a64fddb97291 100644 --- a/ci-operator/step-registry/interop-tests/ocs-tests/interop-tests-ocs-tests-commands.sh +++ b/ci-operator/step-registry/interop-tests/ocs-tests/interop-tests-ocs-tests-commands.sh @@ -16,6 +16,8 @@ LOGS_FOLDER="${ARTIFACT_DIR}/ocs-tests" LOGS_CONFIG="${LOGS_FOLDER}/ocs-tests-config.yaml" CLUSTER_PATH="${ARTIFACT_DIR}/ocs-tests" +export BIN_FOLDER="${LOGS_FOLDER}/bin" + # # Remove the ACM Subscription to allow OCS interop tests full control of operators # @@ -31,6 +33,9 @@ export OCSCI_DATA_DIR="${ARTIFACT_DIR}" mkdir -p "${LOGS_FOLDER}" mkdir -p "${CLUSTER_PATH}/auth" mkdir -p "${CLUSTER_PATH}/data" +mkdir -p "${BIN_FOLDER}" + +export PATH="${BIN_FOLDER}:${PATH}" cp -v "${KUBECONFIG}" "${CLUSTER_PATH}/auth/kubeconfig" cp -v "${KUBEADMIN_PASSWORD_FILE}" "${CLUSTER_PATH}/auth/kubeadmin-password" @@ -39,6 +44,7 @@ cp -v "${KUBEADMIN_PASSWORD_FILE}" "${CLUSTER_PATH}/auth/kubeadmin-password" cat > "${LOGS_CONFIG}" << __EOF__ --- RUN: + bin_dir: "${BIN_FOLDER}" log_dir: "${LOGS_FOLDER}" REPORTING: default_ocs_must_gather_image: "quay.io/rhceph-dev/ocs-must-gather" @@ -78,4 +84,3 @@ fi if [[ -f /tmp/acm-policy-subscription-backup.yaml ]]; then oc apply -f /tmp/acm-policy-subscription-backup.yaml fi - From 512b33a8c7b4d4ae87ca0d639daca19f7a2c876f Mon Sep 17 00:00:00 2001 From: Rabin Yasharzadehe Date: Mon, 13 May 2024 15:42:59 +0300 Subject: [PATCH 3/3] Set cache folder for pytest Signed-off-by: Rabin Yasharzadehe --- .../interop-tests/ocs-tests/interop-tests-ocs-tests-commands.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ci-operator/step-registry/interop-tests/ocs-tests/interop-tests-ocs-tests-commands.sh b/ci-operator/step-registry/interop-tests/ocs-tests/interop-tests-ocs-tests-commands.sh index a64fddb97291..1195aaf02404 100644 --- a/ci-operator/step-registry/interop-tests/ocs-tests/interop-tests-ocs-tests-commands.sh +++ b/ci-operator/step-registry/interop-tests/ocs-tests/interop-tests-ocs-tests-commands.sh @@ -55,7 +55,7 @@ __EOF__ set -x START_TIME=$(date "+%s") -run-ci --color=yes tests/ -m 'acceptance and not ui' -k '' \ +run-ci --color=yes -o cache_dir=/tmp tests/ -m 'acceptance and not ui' -k '' \ --ocsci-conf "${LOGS_CONFIG}" \ --collect-logs \ --ocs-version "${OCS_VERSION}" \