From 1aa463e5052355514c4e9537c6a1f9f4f83e09c0 Mon Sep 17 00:00:00 2001 From: rbovill Date: Tue, 26 Nov 2024 08:46:59 -0700 Subject: [PATCH 1/2] Fix container username in Jenkinsfile. --- Jenkinsfile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index 2f3e07f22..5f07f65cf 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -34,8 +34,8 @@ pipeline { steps { script { sh """ - docker run --name ${container_name} -di --rm -v ${WORKSPACE}:/home/appuser/trunk/ts_xml -w /home/appuser/trunk/ts_xml lsstts/robot:latest - docker exec -u appuser -w /home/appuser/trunk/ts_xml ${container_name} sh -c "python3 -m pip install .[test] && \ + docker run --name ${container_name} -di --rm -v ${WORKSPACE}:/home/saluser/trunk/ts_xml -w /home/saluser/trunk/ts_xml lsstts/robot:latest + docker exec -u saluser -w /home/saluser/trunk/ts_xml ${container_name} sh -c "python3 -m pip install .[test] && \ pytest -ra -o junit_family=xunit2 --junitxml=tests/results/results.xml" docker stop ${container_name} echo "Test complete" From 2f2a0ddffb4113f51996f8000809449f4b1ddc9f Mon Sep 17 00:00:00 2001 From: rbovill Date: Tue, 26 Nov 2024 09:04:45 -0700 Subject: [PATCH 2/2] Add news fragment. --- doc/news/DM-47806.bugfix.rst | 1 + 1 file changed, 1 insertion(+) create mode 100644 doc/news/DM-47806.bugfix.rst diff --git a/doc/news/DM-47806.bugfix.rst b/doc/news/DM-47806.bugfix.rst new file mode 100644 index 000000000..8174781b2 --- /dev/null +++ b/doc/news/DM-47806.bugfix.rst @@ -0,0 +1 @@ +Fix the container username in Jenkinfile.