Merge pull request #101 from UIUCLibrary/dev

Dev
UIUCLibrary · Jan 9, 2024 · e5f2b97 · e5f2b97
2 parents da6c57c + d7711a5
commit e5f2b97
Showing 1 changed file with 18 additions and 9 deletions.
diff --git a/Jenkinsfile b/Jenkinsfile
@@ -419,7 +419,7 @@ pipeline {
                         }
                     }
                 }
-                stage('Run Tox'){
+                stage('Tox'){
                     when{
                         equals expected: true, actual: params.TEST_RUN_TOX
                     }
@@ -456,7 +456,9 @@ pipeline {
                                     failFast: true
                                 )
                             }
-                            parallel(windowsJobs + linuxJobs)
+                            stage('Run Tox'){
+                                parallel(windowsJobs + linuxJobs)
+                            }
                         }
                     }
                 }
@@ -475,16 +477,21 @@ pipeline {
             stages{
                 stage('Source and Wheel formats'){
                     agent {
-                        dockerfile {
-                            filename 'ci/docker/python/linux/jenkins/Dockerfile'
-                            label 'linux && docker && x86'
-                            additionalBuildArgs '--build-arg PIP_EXTRA_INDEX_URL --build-arg PIP_TRUSTED_HOST --build-arg PYTHON_VERSION=3.11 --build-arg PIP_DOWNLOAD_CACHE=/.cache/pip'
-                            args '--mount source=pipcache_hathizip,target=/.cache/pip'
-                        }
+                        docker{
+                            image 'python'
+                            label 'linux && docker'
+                          }
                     }
                     steps{
                         timeout(5){
-                            sh 'python setup.py sdist -d dist bdist_wheel -d dist'
+                            withEnv(['PIP_NO_CACHE_DIR=off']) {
+                                sh(label: 'Build Python Package',
+                                   script: '''python -m venv venv --upgrade-deps
+                                              venv/bin/pip install build
+                                              venv/bin/python -m build .
+                                              '''
+                                    )
+                            }
                         }
                     }
                     post{
@@ -645,6 +652,7 @@ pipeline {
                                                         checkout scm
                                                         unstash 'dist'
                                                     },
+                                                    retries: 3,
                                                     testCommand: {
                                                         findFiles(glob: 'dist/*.tar.gz').each{
                                                             sh(label: 'Running Tox',
@@ -671,6 +679,7 @@ pipeline {
                                                         checkout scm
                                                         unstash 'dist'
                                                     },
+                                                    retries: 3,
                                                     testCommand: {
                                                         findFiles(glob: 'dist/*.whl').each{
                                                             sh(label: 'Running Tox',