From dd2799b58b1d265f7179b298b903860e0c5b4648 Mon Sep 17 00:00:00 2001 From: Mandel Olaiya Date: Tue, 24 Feb 2026 02:59:20 +0100 Subject: [PATCH] Revert "Standardize Jenkins stages to canonical project pipeline" This reverts commit 611a1befc996f07e3d213abf226eeba7c870b512. --- Jenkinsfile | 49 ++++++++++++++++++++++++++----------------------- 1 file changed, 26 insertions(+), 23 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index c115614..9e68a14 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -2,57 +2,42 @@ pipeline { agent any - options { - disableConcurrentBuilds() - timestamps() - buildDiscarder(logRotator(numToKeepStr: '30')) - } - + options { disableConcurrentBuilds() } environment { PYENVPIPELINE_VIRTUALENV = '1' - PIP_DISABLE_PIP_VERSION_CHECK = '1' - PYTHONUNBUFFERED = '1' } stages { - stage('Runtime') { + stage('Build') { steps { sh ''' - python3 --version python3 -m venv .venv - . .venv/bin/activate - python -m pip install -U "pip<24.1" "setuptools<81" wheel - ''' - } - } - - stage('Resolve Dependencies') { - steps { - sh ''' . .venv/bin/activate pip install coverage + pip install --upgrade pip "setuptools==69.5.1" wheel make EXTRAS="" install cp "${JOB_BASE_NAME}/ocyan.json" "${JOB_BASE_NAME}/${JOB_BASE_NAME}.json" - pip install ruff pylint pylint-django vdt.versionplugin.wheel + pip install pylint pylint-django vdt.versionplugin.wheel + pip install --upgrade "setuptools==69.5.1" wheel make migrate loaddata collectstatic pip install "httpx<0.28" ''' } } - stage('Lint') { steps { sh ''' . .venv/bin/activate + pip install coverage make lint ''' } } - stage('Test') { steps { sh ''' . .venv/bin/activate + pip install coverage make test ''' } @@ -60,12 +45,22 @@ pipeline { always { junit allowEmptyResults: true, testResults: '**/nosetests.xml' } + success { + echo "Coverage step skipped" + } } } } - post { + always { + echo 'This will always run' + } success { + echo 'This will run only if successful' + sh ''' + . .venv/bin/activate + pip install coverage + ''' build job: 'deploy-project-stg', parameters: [string(name: 'PROJECT_NAME', value: env.JOB_BASE_NAME)], wait: false, @@ -75,6 +70,14 @@ pipeline { emailext subject: "JENKINS-NOTIFICATION: ${currentBuild.currentResult}: Job '${env.JOB_NAME} #${env.BUILD_NUMBER}'", body: '${SCRIPT, template="groovy-text.template"}', recipientProviders: [culprits(), brokenBuildSuspects(), brokenTestsSuspects()] + + } + unstable { + echo 'This will run only if the run was marked as unstable' + } + changed { + echo 'This will run only if the state of the Pipeline has changed' + echo 'For example, if the Pipeline was previously failing but is now successful' } } }