Skip to content

Use custom script to invoke registry extended test suite #729

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

Closed
miminar wants to merge 2 commits into from
Closed

Use custom script to invoke registry extended test suite #729

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
0ff3348
Use custom script to invoke registry extended test suite
Oct 13, 2017
7b9a497
sjb/generate.sh: use python2 if available
Oct 16, 2017
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
22 changes: 21 additions & 1 deletion sjb/config/test_cases/test_pull_request_origin_extended_image_registry.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,5 +10,25 @@ extensions:
title: "run extended tests"
repository: "origin"
script: |-
for pth in ${OS_ROOT:-} "$(pwd)" "$(dirname ${BASH_SOURCE})" "/data/src/github.com/openshift/origin"; do
Copy link
Copy Markdown
Contributor

@stevekuznetsov stevekuznetsov Oct 19, 2017

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

In the test env you can be certain Origin is at /data/src/github.com/openshift/origin

if [[ -e "${pth}/hack/lib/init.sh" && -e "${pth}/test/extended/setup.sh" ]]; then
export OS_ROOT="${pth}"
break
fi
done

OS_BUILD_ENV_PULL_IMAGE=true OS_BUILD_ENV_PRESERVE=_output/local/bin/linux/amd64/extended.test hack/env make build-extended-test
OPENSHIFT_SKIP_BUILD='true' KUBECONFIG=/etc/origin/master/admin.kubeconfig TEST_ONLY=true JUNIT_REPORT='true' make test-extended SUITE=core FOCUS="\[Feature:Image|\[registry\]"

export OPENSHIFT_SKIP_BUILD=true
export KUBECONFIG=/etc/origin/master/admin.kubeconfig
export TEST_ONLY=true
export JUNIT_REPORT=true

source "${OS_ROOT}/hack/lib/init.sh"
source "${OS_ROOT}/test/extended/setup.sh"

export TEST_REPORT_FILE_NAME=registry_suite
export FOCUS="\[Feature:Image|\[registry\]"

os::log::info "Running registry extended tests serially"
os::test::extended::run -- -test.timeout 6h ${TEST_EXTENDED_ARGS:-}
9 changes: 7 additions & 2 deletions sjb/generate.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,12 +4,17 @@ set -o errexit
set -o nounset
set -o pipefail

bin="python"
if which python2 >/dev/null 2>&1; then
bin="python2"
fi

pushd sjb >/dev/null
for spec in config/test_cases/*.yml; do
python -m generate "${spec}" "test"
"${bin}" -m generate "${spec}" "test"
done

for spec in config/test_suites/*.yml; do
python -m generate "${spec}" "suite"
"${bin}" -m generate "${spec}" "suite"
done
popd >/dev/null
22 changes: 21 additions & 1 deletion sjb/generated/test_pull_request_origin_extended_image_registry.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -395,8 +395,28 @@ cat <<SCRIPT >"${script}"
#!/bin/bash
set -o errexit -o nounset -o pipefail -o xtrace
cd "\${GOPATH}/src/github.com/openshift/origin"
for pth in \${OS_ROOT:-} "\$(pwd)" "\$(dirname \${BASH_SOURCE})" "/data/src/github.com/openshift/origin"; do
if [[ -e "\${pth}/hack/lib/init.sh" && -e "\${pth}/test/extended/setup.sh" ]]; then
export OS_ROOT="\${pth}"
break
fi
done

OS_BUILD_ENV_PULL_IMAGE=true OS_BUILD_ENV_PRESERVE=_output/local/bin/linux/amd64/extended.test hack/env make build-extended-test
OPENSHIFT_SKIP_BUILD='true' KUBECONFIG=/etc/origin/master/admin.kubeconfig TEST_ONLY=true JUNIT_REPORT='true' make test-extended SUITE=core FOCUS="\[Feature:Image|\[registry\]"

export OPENSHIFT_SKIP_BUILD=true
export KUBECONFIG=/etc/origin/master/admin.kubeconfig
export TEST_ONLY=true
export JUNIT_REPORT=true

source "\${OS_ROOT}/hack/lib/init.sh"
source "\${OS_ROOT}/test/extended/setup.sh"

export TEST_REPORT_FILE_NAME=registry_suite
export FOCUS="\[Feature:Image|\[registry\]"

os::log::info "Running registry extended tests serially"
os::test::extended::run -- -test.timeout 6h \${TEST_EXTENDED_ARGS:-}
SCRIPT
chmod +x "${script}"
scp -F ./.config/origin-ci-tool/inventory/.ssh_config "${script}" openshiftdevel:"${script}"
Expand Down