ci: removed unneeded specialized dockerfiles used in jenkins ci

(cherry picked from commit 66941b3)
UIUCLibrary · Nov 22, 2024 · d5014b6 · d5014b6
1 parent f321799
commit d5014b6
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 150 deletions.
diff --git a/Jenkinsfile b/Jenkinsfile
@@ -355,11 +355,11 @@ pipeline {
                         equals expected: true, actual: params.RUN_CHECKS
                         beforeAgent true
                     }
-                    agent {
-                        dockerfile {
-                            filename 'ci/docker/python/linux/jenkins/Dockerfile'
-                            label 'linux && docker && x86'
-                            args '--mount source=python-tmp-speedwagon,target=/tmp'
+                    agent{
+                       docker {
+                          image 'python'
+                          label 'linux && docker && x86_64'
+                          args '--mount source=python-tmp-speedwagon,target=/tmp'
                         }
                     }
                     environment{
@@ -671,7 +671,7 @@ pipeline {
                                                                     cleanWs(
                                                                         patterns: [
                                                                             [pattern: 'venv/', type: 'INCLUDE'],
-                                                                            [pattern: '.tox', type: 'INCLUDE'],
+                                                                            [pattern: '.tox/', type: 'INCLUDE'],
                                                                             [pattern: '**/__pycache__/', type: 'INCLUDE'],
                                                                         ]
                                                                     )
@@ -717,7 +717,7 @@ pipeline {
                                                 cleanWs(
                                                     patterns: [
                                                         [pattern: 'venv/', type: 'INCLUDE'],
-                                                        [pattern: '.tox', type: 'INCLUDE'],
+                                                        [pattern: '.tox/', type: 'INCLUDE'],
                                                         [pattern: '**/__pycache__/', type: 'INCLUDE'],
                                                     ]
                                                 )

diff --git a/ci/docker/python/linux/jenkins/Dockerfile b/ci/docker/python/linux/jenkins/Dockerfile
diff --git a/ci/docker/python/windows/jenkins/Dockerfile b/ci/docker/python/windows/jenkins/Dockerfile
diff --git a/ci/docker/python/windows/tox/Dockerfile b/ci/docker/python/windows/tox/Dockerfile