Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix OCS/ODF tests step for Interop #51851

Merged
merged 3 commits into from
May 15, 2024
Merged

Fix OCS/ODF tests step for Interop #51851

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
fce81af
Increase test time limit
rabin-io May 9, 2024
9bc7128
Set OCS bin folder
rabin-io May 12, 2024
512b33a
Set cache folder for pytest
rabin-io May 13, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 1 addition & 1 deletion ...egistry/interop-tests/cnv-tests-e2e-deploy/interop-tests-cnv-tests-e2e-deploy-commands.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 " 😴 😴 😴"
Expand Down
9 changes: 7 additions & 2 deletions ci-operator/step-registry/interop-tests/ocs-tests/interop-tests-ocs-tests-commands.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
#
Expand All @@ -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"
Expand All @@ -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"
Expand All @@ -49,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}" \
Expand Down Expand Up @@ -78,4 +84,3 @@ fi
if [[ -f /tmp/acm-policy-subscription-backup.yaml ]]; then
oc apply -f /tmp/acm-policy-subscription-backup.yaml
fi