Skip to content

Commit 57846bd

Browse files
committed
In build_whl stage use podman to solve a merge conflict
1 parent 7ce2af7 commit 57846bd

File tree

1 file changed

+5
-5
lines changed

1 file changed

+5
-5
lines changed

.Jenkins/workflows/Jenkinsfile_EL9

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -135,16 +135,16 @@ pipeline {
135135
fi
136136
cd ..
137137
'''
138-
echo "prepare docker image ${buildwhlStageDockerImage}"
139-
sh "docker build --pull --tag ${buildwhlStageDockerImage} --build-arg BASEIMAGE=hepcloud/decision-engine-ci-el9:${BRANCH} --build-arg UID=\$(id -u) --build-arg GID=\$(id -g) -f decisionengine_modules/package/ci/EL9/Dockerfile decisionengine_modules/package/ci/EL9/"
138+
echo "prepare podman image ${buildwhlStageDockerImage}"
139+
sh "podman build --pull --tag ${buildwhlStageDockerImage} --build-arg BASEIMAGE=hepcloud/decision-engine-ci-el9:${BRANCH} --build-arg UID=\$(id -u) --build-arg GID=\$(id -g) -f decisionengine_modules/package/ci/EL9/Dockerfile decisionengine_modules/package/ci/EL9/"
140140
echo "Run ${STAGE_NAME} tests"
141-
sh "docker run --rm --env GITHUB_PR_NUMBER=${GITHUB_PR_NUMBER} --env PYTEST_TIMEOUT=${PYTEST_TIMEOUT} -v ${WORKSPACE}/decisionengine_modules:${WORKSPACE}/decisionengine_modules -w ${WORKSPACE}/decisionengine_modules ${buildwhlStageDockerImage} \"setup.py bdist_wheel\" \"build_whl.log\" \"${BRANCH}\""
141+
sh "podman run --userns keep-id:uid=\$(id -u),gid=\$(id -g) --rm --env GITHUB_PR_NUMBER=${GITHUB_PR_NUMBER} --env PYTEST_TIMEOUT=${PYTEST_TIMEOUT} -v ${WORKSPACE}/decisionengine_modules:${WORKSPACE}/decisionengine_modules -w ${WORKSPACE}/decisionengine_modules ${buildwhlStageDockerImage} \"setup.py bdist_wheel\" \"build_whl.log\" \"${BRANCH}\""
142142
}
143143
post {
144144
always {
145145
archiveArtifacts artifacts: "decisionengine_modules/build_whl.log,decisionengine_modules/dist/*.whl"
146-
echo "cleanup docker image ${buildwhlStageDockerImage}"
147-
sh "docker rmi ${buildwhlStageDockerImage}"
146+
echo "cleanup podman image ${buildwhlStageDockerImage}"
147+
sh "podman rmi ${buildwhlStageDockerImage}"
148148
}
149149
}
150150
}

0 commit comments

Comments
 (0)