test: Enable conformance-k8s for 1.16
Include parallelism
@@ -40,10 +40,10 @@ To recreate these results
test/extended/conformance-k8s.sh
-Nightly conformance tests are run against release branches and reported https://openshift-gce-devel.appspot.com/builds/origin-ci-test/logs/test_branch_origin_extended_conformance_k8s/
+Nightly conformance tests are run against release branches and reported https://openshift-gce-devel.appspot.com/builds/origin-ci-test/logs/periodic-ci-origin-conformance-k8s/
END
-version="${KUBERNETES_VERSION:-release-1.14}"
+version="${KUBERNETES_VERSION:-release-1.16}"
kubernetes="${KUBERNETES_ROOT:-${OS_ROOT}/../../../k8s.io/kubernetes}"
if [[ -d "${kubernetes}" ]]; then
git fetch origin --tags
@@ -76,17 +76,32 @@ pushd "${kubernetes}" > /dev/null
git checkout "${version}"
make WHAT=cmd/kubectl
make WHAT=test/e2e/e2e.test
+make WHAT=vendor/github.com/onsi/ginkgo/ginkgo
export PATH="${kubernetes}/_output/local/bin/$( os::build::host_platform ):${PATH}"
kubectl version > "${test_report_dir}/version.txt"
echo "-----" >> "${test_report_dir}/version.txt"
oc version >> "${test_report_dir}/version.txt"
-# Run the test
-e2e.test '-ginkgo.focus=\[Conformance\]' \
- -report-dir "${test_report_dir}" -ginkgo.noColor \
+# Run the test, serial tests first, then parallel
+
+rc=0
+
+ginkgo \
+ -nodes 1 -noColor '-focus=(\[Conformance\].*\[Serial\]|\[Serial\].*\[Conformance\])' $( which e2e.test ) -- \
+ -report-dir "${test_report_dir}" \
+ -allowed-not-ready-nodes ${unschedulable} \
+ 2>&1 | tee -a "${test_report_dir}/e2e.log" || rc=1
+
+rename -v junit_ junit_serial_ ${test_report_dir}/junit*.xml
+
+ginkgo \
+ -nodes 4 -noColor '-skip=\[Serial\]' '-focus=\[Conformance\]' $( which e2e.test ) -- \
+ -report-dir "${test_report_dir}" \
-allowed-not-ready-nodes ${unschedulable} \
- 2>&1 | tee "${test_report_dir}/e2e.log"
+ 2>&1 | tee -a "${test_report_dir}/e2e.log" || rc=1
echo
echo "Run complete, results in ${test_report_dir}"
+
+exit $rc
\ No newline at end of file
