Merge pull request #16 from UIUCLibrary/henryborchers-patch-1

ci: Jenkin - remove call to fileloader
UIUCLibrary · May 20, 2024 · d8764ec · d8764ec
2 parents ba19ba8 + 40f1202
commit d8764ec
Showing 1 changed file with 8 additions and 9 deletions.
diff --git a/Jenkinsfile b/Jenkinsfile
@@ -1,3 +1,9 @@
+library identifier: 'JenkinsPythonHelperLibrary@2024.1.2', retriever: modernSCM(
+  [$class: 'GitSCMSource',
+   remote: 'https://github.com/UIUCLibrary/JenkinsPythonHelperLibrary.git',
+   ])
+
+
 def getMacToxTestsParallel(args = [:]){
     def nodeLabel = args['label']
     args.remove('label')
@@ -262,21 +268,14 @@ pipeline {
                     }
                     steps{
                         script{
-                            def tox = fileLoader.fromGit(
-                                                        'tox',
-                                                        'https://github.com/UIUCLibrary/jenkins_helper_scripts.git',
-                                                        '8',
-                                                        null,
-                                                        ''
-                                                        )
                             def linuxJobs = [:]
 
                             def windowsJobs = [:]
                             def macJobs = [:]
                             parallel(
                                 'Tox Information Gathering For: Linux': {
                                     if(nodesByLabel("linux && docker").size() > 0){
-                                        linuxJobs = tox.getToxTestsParallel(
+                                        linuxJobs = getToxTestsParallel(
                                             envNamePrefix: 'Tox Linux',
                                             label: 'linux && docker',
                                             dockerfile: 'ci/docker/linux/tox/Dockerfile',
@@ -290,7 +289,7 @@ pipeline {
                                 },
                                 'Tox Information Gathering For: Windows': {
                                     if(nodesByLabel('windows && docker').size() > 0){
-                                        windowsJobs = tox.getToxTestsParallel(
+                                        windowsJobs = getToxTestsParallel(
                                             envNamePrefix: 'Tox Windows',
                                             label: 'windows && docker',
                                             dockerfile: 'ci/docker/windows/tox/Dockerfile',