Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -105,6 +105,7 @@ source ocp_install_env.sh
echo "export DS_OPENSHIFT_VERSION=\$(openshift_version)" >> /tmp/ds-vars.conf
echo "export DS_REGISTRY=\$LOCAL_REGISTRY_DNS_NAME:\$LOCAL_REGISTRY_PORT" >> /tmp/ds-vars.conf
echo "export DS_WORKING_DIR=\$WORKING_DIR" >> /tmp/ds-vars.conf
echo "export DS_IP_STACK=\$IP_STACK" >> /tmp/ds-vars.conf
EOF

scp "${SSHOPTS[@]}" "root@${IP}:/tmp/ds-vars.conf" "${SHARED_DIR}/"
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ function copy_test_binaries() {
function mirror_test_images() {
echo "### Mirroring test images"

DEVSCRIPTS_TEST_IMAGE_REPO=${DS_REGISTRY}/localimages/local-test-image
DEVSCRIPTS_TEST_IMAGE_REPO=${DS_REGISTRY}/localimages/local-test-image
# shellcheck disable=SC2087
ssh "${SSHOPTS[@]}" "root@${IP}" bash - << EOF
openshift-tests images --to-repository ${DEVSCRIPTS_TEST_IMAGE_REPO} > /tmp/mirror
Expand All @@ -34,7 +34,7 @@ EOF

function use_minimal_test_list() {
echo "### Skipping test images mirroring, fall back to minimal tests list"

TEST_ARGS="--file /tmp/tests"
TEST_SKIPS=""
echo "${TEST_MINIMAL_LIST}" > /tmp/tests
Expand All @@ -47,12 +47,21 @@ packet)
# shellcheck source=/dev/null
source "${SHARED_DIR}/ds-vars.conf"
copy_test_binaries
export TEST_PROVIDER=\"\"

# Currently all v6 deployments are disconnected, so we have to tell
# openshift-tests to exclude those tests that require internet
# access.
if [[ "${DS_IP_STACK}" != "v6" ]];
then
export TEST_PROVIDER='\{\"type\":\"baremetal\"\}'
else
export TEST_PROVIDER='\{\"type\":\"baremetal\",\"disconnected\":true\}'
fi

echo "### Checking release version"
# Mirroring test images is supported only for versions greater than or equal to 4.7
if printf '%s\n%s' "4.8" "${DS_OPENSHIFT_VERSION}" | sort -C -V; then
mirror_test_images
mirror_test_images
else
use_minimal_test_list
fi
Expand All @@ -65,7 +74,7 @@ function upgrade() {
ssh "${SSHOPTS[@]}" "root@${IP}" \
openshift-tests run-upgrade all \
--to-image "${OPENSHIFT_UPGRADE_RELEASE_IMAGE_OVERRIDE}" \
--provider "${TEST_PROVIDER}" \
--provider "${TEST_PROVIDER:-}" \
-o "/tmp/artifacts/e2e.log" \
--junit-dir "/tmp/artifacts/junit"
set +x
Expand All @@ -81,11 +90,11 @@ function suite() {
fi

scp "${SSHOPTS[@]}" /tmp/tests "root@${IP}:/tmp/tests"

set -x
ssh "${SSHOPTS[@]}" "root@${IP}" \
openshift-tests run "${TEST_SUITE}" "${TEST_ARGS:-}" \
--provider "${TEST_PROVIDER}" \
--provider "${TEST_PROVIDER:-}" \
-o "/tmp/artifacts/e2e.log" \
--junit-dir "/tmp/artifacts/junit"
set +x
Expand Down
Loading