Skip to content

Commit 7ec28ae

Browse files
vitodbvitodb
authored
Merge branch 'master_test' into feature/new_distr_test
2 parents 7ce2af7 + 5577e9e commit 7ec28ae

24 files changed

+5628
-140
lines changed

‎.Jenkins/workflows/Jenkinsfile_EL9‎

Lines changed: 19 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -2,14 +2,14 @@
22
// SPDX-License-Identifier: Apache-2.0
33

44
pipeline {
5-
agent { label 'docker' }
5+
agent { label 'podman' }
66
stages{
77
stage('DE modules tests') {
88
parallel {
99
stage('flake8') {
1010
agent {
1111
node {
12-
label 'docker'
12+
label 'podman'
1313
customWorkspace "${WORKSPACE}/${STAGE_NAME}"
1414
}
1515
}
@@ -47,23 +47,23 @@ pipeline {
4747
fi
4848
cd ..
4949
'''
50-
echo "prepare docker image ${flake8StageDockerImage}"
51-
sh "docker build --pull --tag ${flake8StageDockerImage} --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/"
50+
echo "prepare podman image ${flake8StageDockerImage}"
51+
sh "podman build --pull --tag ${flake8StageDockerImage} --build-arg BASEIMAGE=docker.io/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/"
5252
echo "Run ${STAGE_NAME} tests"
53-
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 ${flake8StageDockerImage} \"-m pytest -m flake8 --flake8\" \"flake8.log\" \"${BRANCH}\""
53+
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 ${flake8StageDockerImage} \"-m flake8\" \"flake8.log\" \"${BRANCH}\""
5454
}
5555
post {
5656
always {
5757
archiveArtifacts artifacts: "decisionengine_modules/flake8.log"
58-
echo "cleanup docker image ${flake8StageDockerImage}"
59-
sh "docker rmi ${flake8StageDockerImage}"
58+
echo "cleanup podman image ${flake8StageDockerImage}"
59+
sh "podman rmi ${flake8StageDockerImage}"
6060
}
6161
}
6262
}
6363
stage('unit_tests') {
6464
agent {
6565
node {
66-
label 'docker'
66+
label 'podman'
6767
customWorkspace "${WORKSPACE}/${STAGE_NAME}"
6868
}
6969
}
@@ -91,23 +91,23 @@ pipeline {
9191
fi
9292
cd ..
9393
'''
94-
echo "prepare docker image ${unit_testsStageDockerImage}"
95-
sh "docker build --pull --tag ${unit_testsStageDockerImage} --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/"
94+
echo "prepare podman image ${unit_testsStageDockerImage}"
95+
sh "podman build --pull --tag ${unit_testsStageDockerImage} --build-arg BASEIMAGE=docker.io/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/"
9696
echo "Run ${STAGE_NAME} tests"
97-
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 ${unit_testsStageDockerImage} \"-m pytest --cov-report term --cov=decisionengine_modules --no-cov-on-fail\" \"pytest.log\" \"${BRANCH}\""
97+
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 ${unit_testsStageDockerImage} \"-m pytest --cov-report term --cov=decisionengine_modules --no-cov-on-fail\" \"pytest.log\" \"${BRANCH}\""
9898
}
9999
post {
100100
always {
101101
archiveArtifacts artifacts: "decisionengine_modules/pytest.log"
102-
echo "cleanup docker image ${unit_testsStageDockerImage}"
103-
sh "docker rmi ${unit_testsStageDockerImage}"
102+
echo "cleanup podman image ${unit_testsStageDockerImage}"
103+
sh "podman rmi ${unit_testsStageDockerImage}"
104104
}
105105
}
106106
}
107107
stage('build_whl') {
108108
agent {
109109
node {
110-
label 'docker'
110+
label 'podman'
111111
customWorkspace "${WORKSPACE}/${STAGE_NAME}"
112112
}
113113
}
@@ -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=docker.io/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
}

‎.flake8‎

Lines changed: 28 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,28 @@
1+
# SPDX-FileCopyrightText: 2017 Fermi Research Alliance, LLC
2+
# SPDX-License-Identifier: Apache-2.0
3+
[flake8]
4+
max-line-length = 120
5+
# Do not test external dependencies
6+
extend-exclude = ./glideinwms,./decisionengine,./build
7+
# Errors and warnings to ignore
8+
extend-ignore =
9+
# line too long (90 > 79 characters)
10+
E501,
11+
# too many blank lines (2)
12+
E303,
13+
# expected 2 blank lines, found 1
14+
E302,
15+
# at least two spaces before inline comment
16+
E261,
17+
# block comment should start with '# '
18+
E265,
19+
# whitespace before ':'
20+
E203,
21+
# permit line breaks in binary operators
22+
W503,
23+
# permit line breaks in binary operators
24+
W504
25+
exclude: []
26+
count: True
27+
show-source: True
28+
statistics: True

‎.github/workflows/linters.yaml‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,7 @@ on:
1414

1515
jobs:
1616
run_flake8:
17-
if: ${{ github.ref == 'refs/heads/1.7' }}
18-
name: Run pytest-flake8 against code tree
17+
name: Run flake8 against code tree
1918
runs-on: ubuntu-latest
2019
steps:
2120
- name: checkout DE Modules
@@ -92,7 +91,7 @@ jobs:
9291
PYTHONPATH: ${{ github.workspace }}/../:${{ github.workspace }}
9392
run: |
9493
cd ${{ github.workspace }}/decisionengine_modules
95-
pytest -m flake8 --flake8 --log-level=WARNING
94+
python3 -m flake8
9695
9796
run_pylint:
9897
name: Run pylint against code tree

‎.reuse/dep5‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ Source: https://github.com/HEPCloud/decisionengine_modules
1111
# SPDX-FileCopyrightText: 2017 Fermi Research Alliance, LLC
1212
# SPDX-License-Identifier: Apache-2.0
1313

14-
Files: src/*.jsonnet src/*/readme src/*.conf src/*.fixture src/*.csv src/*/AWS/scratch src/*/gce_limits_factory_entries.test src/*/data/monitoring.json src/*/data/passwd
14+
Files: src/*.jsonnet src/*/readme src/*.conf src/*.fixture src/*.csv src/*/AWS/scratch src/*/gce_limits_factory_entries.test src/*/data/monitoring.json src/*/data/passwd src/*/data/expected_metric_values.json
1515
Copyright: 2017 Fermi Research Alliance, LLC
1616
License: Apache-2.0
1717

@@ -22,3 +22,7 @@ License: Apache-2.0
2222
Files: package/rpm/* package/systemd/*
2323
Copyright: 2017 Fermi Research Alliance, LLC
2424
License: Apache-2.0
25+
26+
Files: dashboards/*.json
27+
Copyright: 2017 Fermi Research Alliance, LLC
28+
License: Apache-2.0

0 commit comments

Comments
 (0)