From 0daf22cba0383be510a90970a2101bdee91f3613 Mon Sep 17 00:00:00 2001 From: mussbach <57546580+mussbach@users.noreply.github.com> Date: Thu, 12 Sep 2024 18:39:21 +0200 Subject: [PATCH] chore: distinct ci container for better jenkins performance (3653) * chore: distinct ci container for better jenkins performance * chore: phpunit is needed * chore: define composer cache dir --- Jenkinsfile | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index 2c2a4c7699..7324f2e74f 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -50,13 +50,13 @@ pipeline { stage('Preparations') { steps { withCredentials([usernamePassword(credentialsId: 'Docker', usernameVariable: 'USERNAME', passwordVariable: 'PASSWORD')]) { - sh '''docker login --username $USERNAME --password $PASSWORD && docker pull demosdeutschland/demosplan-base:latest''' + sh '''docker login --username $USERNAME --password $PASSWORD && docker pull demosdeutschland/demosplan-ci:latest''' } script{ containerName = "testContainer" + env.BRANCH_NAME + env.BUILD_NUMBER - commandDockerRun = 'docker run --cpus=1 -d --name ' + containerName + ' -v ${PWD}:/srv/www -v /var/cache/demosplanCI/:/srv/www/.cache/ --env CURRENT_HOST_USERNAME=$(whoami) --env CURRENT_HOST_USERID=$(id -u $(whoami)) demosdeutschland/demosplan-base:latest' + commandDockerRun = 'docker run --cpus=1 -d --name ' + containerName + ' -v ${PWD}:/srv/www -v /var/cache/demosplanCI/:/srv/www/.cache/ --env CURRENT_HOST_USERNAME=$(whoami) --env CURRENT_HOST_USERID=$(id -u $(whoami)) demosdeutschland/demosplan-ci:latest' commandExecYarn = _dockerExecAsUser('YARN_CACHE_FOLDER=/srv/www/.cache/yarn yarn install --immutable --check-cache', containerName) - commandExecComposer = _dockerExecAsRoot('composer install --no-interaction', containerName) + commandExecComposer = _dockerExecAsRoot('COMPOSER_CACHE_DIR=/srv/www/.cache/composer composer install --classmap-authoritative --no-interaction', containerName) sh "mkdir -p .cache" sh "echo ${PWD}" sh "$commandDockerRun"