Procházet zdrojové kódy

docker-py: output junit.xml for test-results

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Sebastiaan van Stijn před 5 roky
rodič
revize
5969bbee79
2 změnil soubory, kde provedl 8 přidání a 2 odebrání
  1. 5 0
      Jenkinsfile
  2. 3 2
      hack/make/test-docker-py

+ 5 - 0
Jenkinsfile

@@ -80,6 +80,11 @@ pipeline {
                                     test-docker-py
                                     test-docker-py
                                 '''
                                 '''
                             }
                             }
+                            post {
+                                always {
+                                    junit testResults: 'bundles/test-docker-py/junit-report.xml', allowEmptyResults: true
+                                }
+                            }
                         }
                         }
                         stage("Static") {
                         stage("Static") {
                             steps {
                             steps {

+ 3 - 2
hack/make/test-docker-py

@@ -17,6 +17,7 @@ source hack/make/.integration-test-helpers
 --deselect=tests/integration/api_exec_test.py::ExecDemuxTest::test_exec_command_tty_stream_no_demux \
 --deselect=tests/integration/api_exec_test.py::ExecDemuxTest::test_exec_command_tty_stream_no_demux \
 --deselect=tests/integration/api_build_test.py::BuildTest::test_build_invalid_platform \
 --deselect=tests/integration/api_build_test.py::BuildTest::test_build_invalid_platform \
 --deselect=tests/integration/api_image_test.py::PullImageTest::test_pull_invalid_platform \
 --deselect=tests/integration/api_image_test.py::PullImageTest::test_pull_invalid_platform \
+--junitxml=${DEST}/junit-report.xml \
 }"
 }"
 (
 (
 	bundle .integration-daemon-start
 	bundle .integration-daemon-start
@@ -56,8 +57,8 @@ source hack/make/.integration-test-helpers
 	echo INFO: Starting docker-py tests...
 	echo INFO: Starting docker-py tests...
 	(
 	(
 		[ -n "${TESTDEBUG}" ] && set -x
 		[ -n "${TESTDEBUG}" ] && set -x
-		# shellcheck disable=SC2086
-		exec docker run --rm ${run_opts} "${docker_py_image}" pytest ${PY_TEST_OPTIONS} tests/integration
+		# shellcheck disable=SC2086,SC2140
+		exec docker run --rm ${run_opts} --mount type=bind,"src=${ABS_DEST}","dst=/src/${DEST}" "${docker_py_image}" pytest ${PY_TEST_OPTIONS} tests/integration
 	)
 	)
 	bundle .integration-daemon-stop
 	bundle .integration-daemon-stop
 ) 2>&1 | tee -a "$DEST/test.log"
 ) 2>&1 | tee -a "$DEST/test.log"