From 0ff3348768152e8e9ea8590a571f474b46b0d209 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Michal=20Min=C3=A1=C5=99?= Date: Fri, 13 Oct 2017 18:07:20 +0200 Subject: [PATCH 1/2] Use custom script to invoke registry extended test suite MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit The `test/extended/core.sh` script does not allow to properly focus only the desired tests to run. This script contains the necessary bits from the `core.sh` scripts to setup the environment and run just the registry tests. Signed-off-by: Michal Minář --- ...request_origin_extended_image_registry.yml | 22 ++++++++++++++++++- ...request_origin_extended_image_registry.xml | 22 ++++++++++++++++++- 2 files changed, 42 insertions(+), 2 deletions(-) diff --git a/sjb/config/test_cases/test_pull_request_origin_extended_image_registry.yml b/sjb/config/test_cases/test_pull_request_origin_extended_image_registry.yml index cb5a924633..26ad391928 100644 --- a/sjb/config/test_cases/test_pull_request_origin_extended_image_registry.yml +++ b/sjb/config/test_cases/test_pull_request_origin_extended_image_registry.yml @@ -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 + 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\]" \ No newline at end of file + + 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:-} diff --git a/sjb/generated/test_pull_request_origin_extended_image_registry.xml b/sjb/generated/test_pull_request_origin_extended_image_registry.xml index f44e6ff221..4c0a2e3baa 100644 --- a/sjb/generated/test_pull_request_origin_extended_image_registry.xml +++ b/sjb/generated/test_pull_request_origin_extended_image_registry.xml @@ -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}" From 7b9a49768198d8c75add88ae9ce74a103289812f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Michal=20Min=C3=A1=C5=99?= Date: Mon, 16 Oct 2017 12:09:05 +0200 Subject: [PATCH 2/2] sjb/generate.sh: use python2 if available MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Michal Minář --- sjb/generate.sh | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/sjb/generate.sh b/sjb/generate.sh index cc0eeb61ed..7f284b3322 100755 --- a/sjb/generate.sh +++ b/sjb/generate.sh @@ -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