Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Run build and tests in Jenkins outside docker #817

Merged
merged 2 commits into from
Sep 3, 2024
Merged

Run build and tests in Jenkins outside docker #817

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
6bc4c0a
CI: refactor Jenkinsfile to not use docker for tests
joker234 Aug 27, 2024
ac530b6
CI: remove unnecessary special CI Dockerfile
joker234 Aug 27, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 0 additions & 14 deletions Dockerfile.continuous-integration
View file
Open in desktop

This file was deleted.

59 changes: 26 additions & 33 deletions Jenkinsfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,11 +15,11 @@ pipeline {
RELEASE_REGEX = /^([0-9]+(\.[0-9]+)*)(-(RC|beta-|alpha-)[0-9]+)?$/
RELEASE_DEPLOY = false
SNAPSHOT_DEPLOY = false
POETRY = 'python -m poetry'
POETRY = 'python3 -m poetry'
POETRY_OPTIONS = '--no-ansi --no-interaction'
// wait for an answer to https://github.com/python-poetry/poetry/issues/1567#issuecomment-800542938
// POETRY_RUN = 'python -m poetry run --no-ansi --no-interaction'
POETRY_RUN = 'python -m poetry run'
POETRY_RUN = 'python3 -m poetry run'

DOCKER_CREDENTIALS_ID = 'DockerHubHeiGITCredentials'
DOCKER_REPOSITORY = 'heigit/ohsome-quality-api'
Expand Down Expand Up @@ -51,8 +51,7 @@ pipeline {
}
}
script {
DOCKER_API = docker.build('oqapi-api', "--build-arg uid=${UID} --build-arg gid=${GID} ${MODULE_DIR}")
DOCKER_API_CI = docker.build('oqapi-api-ci', "-f ${MODULE_DIR}/Dockerfile.continuous-integration ${MODULE_DIR}")
sh '${POETRY} install ${POETRY_OPTIONS}'
}
}
post {
Expand All @@ -65,32 +64,28 @@ pipeline {
stage('Test') {
steps {
script {
DOCKER_API_CI.inside("""--add-host 'api.ohsome.org:127.0.3.4' -v /jenkins/tools:/jenkins/tools:ro""") { // blacklist api.ohsome.org
// run pytest
sh 'cd ${WORK_DIR} && VCR_RECORD_MODE=none ${POETRY_RUN} pytest --cov=ohsome_quality_api --cov-report=xml tests'
// replace absolute dir in the coverage file with actually used dir for sonar-scanner
sh "sed -i \"s#${WORK_DIR}#${WORKSPACE}/${MODULE_DIR}#g\" ${WORK_DIR}/coverage.xml"
// run static analysis with sonar-scanner
def scannerHome = tool 'SonarScanner 4'
withSonarQubeEnv('sonarcloud GIScience/ohsome') {
SONAR_CLI_PARAMETER =
"-Dsonar.python.coverage.reportPaths=${WORK_DIR}/coverage.xml " +
"-Dsonar.projectVersion=${VERSION}"
if (env.CHANGE_ID) {
SONAR_CLI_PARAMETER += ' ' +
"-Dsonar.pullrequest.key=${env.CHANGE_ID} " +
"-Dsonar.pullrequest.branch=${env.CHANGE_BRANCH} " +
"-Dsonar.pullrequest.base=${env.CHANGE_TARGET}"
} else {
SONAR_CLI_PARAMETER += ' ' +
"-Dsonar.branch.name=${env.BRANCH_NAME}"
}
sh "${scannerHome}/bin/sonar-scanner " + SONAR_CLI_PARAMETER
// run pytest
sh 'VCR_RECORD_MODE=none ${POETRY_RUN} pytest --cov=ohsome_quality_api --cov-report=xml tests'
// run static analysis with sonar-scanner
def scannerHome = tool 'SonarScanner 4'
withSonarQubeEnv('sonarcloud GIScience/ohsome') {
SONAR_CLI_PARAMETER =
"-Dsonar.python.coverage.reportPaths=${WORK_DIR}/coverage.xml " +
"-Dsonar.projectVersion=${VERSION}"
if (env.CHANGE_ID) {
SONAR_CLI_PARAMETER += ' ' +
"-Dsonar.pullrequest.key=${env.CHANGE_ID} " +
"-Dsonar.pullrequest.branch=${env.CHANGE_BRANCH} " +
"-Dsonar.pullrequest.base=${env.CHANGE_TARGET}"
} else {
SONAR_CLI_PARAMETER += ' ' +
"-Dsonar.branch.name=${env.BRANCH_NAME}"
}
// run other static code analysis
sh 'cd ${WORK_DIR} && ${POETRY_RUN} ruff format --check --diff .'
sh 'cd ${WORK_DIR} && ${POETRY_RUN} ruff .'
sh "${scannerHome}/bin/sonar-scanner " + SONAR_CLI_PARAMETER
}
// run other static code analysis
sh '${POETRY_RUN} ruff format --check --diff .'
sh '${POETRY_RUN} ruff .'
}
}
post {
Expand All @@ -107,14 +102,12 @@ pipeline {
return (((currentBuild.getStartTimeInMillis() - currentBuild.previousBuild.getStartTimeInMillis()) > 2592000000) && (env.BRANCH_NAME ==~ SNAPSHOT_BRANCH_REGEX)) //2592000000 30 days in milliseconds
}
return false
}
}
}
steps {
script {
DOCKER_API.inside {
update_notify = sh(returnStdout: true, script: 'cd ${WORK_DIR} && ${POETRY} update ${POETRY_OPTIONS} --dry-run | tail -n +4 | grep -v ": Skipped " | sort -u').trim()
echo update_notify
}
update_notify = sh(returnStdout: true, script: '${POETRY} update ${POETRY_OPTIONS} --dry-run | tail -n +4 | grep -v ": Skipped " | sort -u').trim()
echo update_notify
}
rocket_basicsend("Check your dependencies in *${REPO_NAME}*. You might have updates: ${update_notify}")
}
Expand Down