Skip to content

Commit fc6aefd

Browse files
vitodbmambelli
authored andcommitted
Docker container and test setup for EL8
This provides Dockerfiles, entrypoint scripts, Jenkinsfile wf configuration, github actions and alike for EL8. Where needed previous EL7 files have been migrated to an EL7 folder. Currently github actions for EL8 are skipped. This also includes an update to setup.py to add distribution name to the RPM.
1 parent 51d5293 commit fc6aefd

17 files changed

Lines changed: 582 additions & 12 deletions

File tree

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -23,9 +23,9 @@ pipeline {
2323
// Set custom Build Name
2424
if (params.GITHUB_PR_NUMBER) {
2525
if (params.GITHUB_PR_STATE == 'CLOSED') {
26-
currentBuild.displayName="${BUILD_NUMBER}#PR#${GITHUB_PR_NUMBER}#CLOSED"
26+
currentBuild.displayName="${BUILD_NUMBER}#${EL_VERSION}#PR#${GITHUB_PR_NUMBER}#CLOSED"
2727
} else {
28-
currentBuild.displayName="${BUILD_NUMBER}#PR#${GITHUB_PR_NUMBER}"
28+
currentBuild.displayName="${BUILD_NUMBER}#${EL_VERSION}#PR#${GITHUB_PR_NUMBER}"
2929
}
3030
} else {
3131
currentBuild.displayName="${BUILD_NUMBER}#${BRANCH}"
@@ -48,7 +48,7 @@ pipeline {
4848
cd ..
4949
'''
5050
echo "prepare docker image ${flake8StageDockerImage}"
51-
sh "docker build --pull --tag ${flake8StageDockerImage} --build-arg BASEIMAGE=hepcloud/decision-engine-ci:${BRANCH} --build-arg UID=\$(id -u) --build-arg GID=\$(id -g) -f decisionengine/package/ci/Dockerfile decisionengine/package/ci/"
51+
sh "docker build --pull --tag ${flake8StageDockerImage} --build-arg BASEIMAGE=hepcloud/decision-engine-ci-el7:${BRANCH} --build-arg UID=\$(id -u) --build-arg GID=\$(id -g) -f decisionengine/package/ci/EL7/Dockerfile decisionengine/package/ci/EL7/"
5252
echo "Run ${STAGE_NAME} tests"
5353
sh "docker run --rm --env PYTEST_TIMEOUT=${PYTEST_TIMEOUT} -v ${WORKSPACE}/decisionengine:${WORKSPACE}/decisionengine -w ${WORKSPACE}/decisionengine ${flake8StageDockerImage} \"-m pytest -m flake8 --flake8\" \"flake8.log\""
5454
}
@@ -103,7 +103,7 @@ pipeline {
103103
cd ..
104104
'''
105105
echo "prepare docker image ${pylintStageDockerImage}"
106-
sh "docker build --pull --tag ${pylintStageDockerImage} --build-arg BASEIMAGE=hepcloud/decision-engine-ci:${BRANCH} --build-arg UID=\$(id -u) --build-arg GID=\$(id -g) -f decisionengine/package/ci/Dockerfile decisionengine/package/ci/"
106+
sh "docker build --pull --tag ${pylintStageDockerImage} --build-arg BASEIMAGE=hepcloud/decision-engine-ci-el7:${BRANCH} --build-arg UID=\$(id -u) --build-arg GID=\$(id -g) -f decisionengine/package/ci/EL7/Dockerfile decisionengine/package/ci/EL7/"
107107
echo "Run ${STAGE_NAME} tests"
108108
sh "docker run --rm --env PYTEST_TIMEOUT=${PYTEST_TIMEOUT} -v ${WORKSPACE}/decisionengine:${WORKSPACE}/decisionengine -w ${WORKSPACE}/decisionengine ${pylintStageDockerImage} \"-m pylint src/decisionengine/ src/tests/\" \"pylint.log\""
109109
}
@@ -158,7 +158,7 @@ pipeline {
158158
cd ..
159159
'''
160160
echo "prepare docker image ${unit_testsStageDockerImage}"
161-
sh "docker build --pull --tag ${unit_testsStageDockerImage} --build-arg BASEIMAGE=hepcloud/decision-engine-ci:${BRANCH} --build-arg UID=\$(id -u) --build-arg GID=\$(id -g) -f decisionengine/package/ci/Dockerfile decisionengine/package/ci/"
161+
sh "docker build --pull --tag ${unit_testsStageDockerImage} --build-arg BASEIMAGE=hepcloud/decision-engine-ci-el7:${BRANCH} --build-arg UID=\$(id -u) --build-arg GID=\$(id -g) -f decisionengine/package/ci/EL7/Dockerfile decisionengine/package/ci/EL7/"
162162
echo "Run ${STAGE_NAME} tests"
163163
sh "docker run --rm --env PYTEST_TIMEOUT=${PYTEST_TIMEOUT} -v ${WORKSPACE}/decisionengine:${WORKSPACE}/decisionengine -w ${WORKSPACE}/decisionengine ${unit_testsStageDockerImage} \"-m pytest --cov-report term --cov=decisionengine --no-cov-on-fail\" \"pytest.log\""
164164
}
@@ -213,7 +213,7 @@ pipeline {
213213
cd ..
214214
'''
215215
echo "prepare docker image ${rpmbuildStageDockerImage}"
216-
sh "docker build --pull --tag ${rpmbuildStageDockerImage} --build-arg BASEIMAGE=hepcloud/decision-engine-ci:${BRANCH} --build-arg UID=\$(id -u) --build-arg GID=\$(id -g) -f decisionengine/package/ci/Dockerfile decisionengine/package/ci/"
216+
sh "docker build --pull --tag ${rpmbuildStageDockerImage} --build-arg BASEIMAGE=hepcloud/decision-engine-ci-el7:${BRANCH} --build-arg UID=\$(id -u) --build-arg GID=\$(id -g) -f decisionengine/package/ci/EL7/Dockerfile decisionengine/package/ci/EL7/"
217217
echo "Run ${STAGE_NAME} tests"
218218
sh "docker run --rm --env PYTEST_TIMEOUT=${PYTEST_TIMEOUT} -v ${WORKSPACE}/decisionengine:${WORKSPACE}/decisionengine -w ${WORKSPACE}/decisionengine ${rpmbuildStageDockerImage} \"setup.py bdist_rpm\" \"rpmbuild.log\""
219219
}

0 commit comments

Comments
 (0)