From ba487ad8b7e35b1a64ff122aef61b79088db4b44 Mon Sep 17 00:00:00 2001 From: Francis Charette Migneault Date: Fri, 29 Oct 2021 15:43:17 -0400 Subject: [PATCH 1/2] add any variation of sub-dir notebooks for artifact collection in Jenkins --- Jenkinsfile | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index 7fc661c7..2e9ceb7d 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -113,8 +113,14 @@ Note this is another run, will double the time and no guaranty to have same erro post { always { - archiveArtifacts(artifacts: 'notebooks/*.ipynb, pavics-sdi-*/docs/source/notebooks/*.ipynb, finch-*/docs/source/notebooks/*.ipynb, raven-*/docs/source/notebooks/*.ipynb, esgf-compute-api-*/examples/*.ipynb, PAVICS-landing-*/content/notebooks/climate_indicators/*.ipynb, buildout/*.output.ipynb, buildout/env-dump/', - fingerprint: true) + archiveArtifacts(artifacts: 'notebooks/*.ipynb', fingerprint: true) + archiveArtifacts(artifacts: 'pavics-sdi-*/docs/source/**/*.ipynb', fingerprint: true, excludes: 'pavics-sdi-*/docs/source/deprecated/**/*') + archiveArtifacts(artifacts: 'finch-*/docs/source/notebooks/*.ipynb', fingerprint: true) + archiveArtifacts(artifacts: 'raven-*/docs/source/notebooks/*.ipynb', fingerprint: true) + archiveArtifacts(artifacts: 'esgf-compute-api-*/examples/*.ipynb', fingerprint: true) + archiveArtifacts(artifacts: 'PAVICS-landing-*/content/notebooks/climate_indicators/*.ipynb', fingerprint: true) + archiveArtifacts(artifacts: 'buildout/*.output.ipynb', fingerprint: true) + archiveArtifacts(artifacts: 'buildout/env-dump/', fingerprint: true) } unsuccessful { // Run if the current builds status is "Aborted", "Failure" or "Unstable" step([$class: 'Mailer', notifyEveryUnstableBuild: false, From 671c1a7ae2c7d95ee48b6b0b7b0350e336364fc6 Mon Sep 17 00:00:00 2001 From: Francis Charette Migneault Date: Fri, 29 Oct 2021 16:35:04 -0400 Subject: [PATCH 2/2] employ explicit paths for pavics-sdi notebooks --- Jenkinsfile | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Jenkinsfile b/Jenkinsfile index 2e9ceb7d..4e5e8046 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -114,7 +114,8 @@ Note this is another run, will double the time and no guaranty to have same erro post { always { archiveArtifacts(artifacts: 'notebooks/*.ipynb', fingerprint: true) - archiveArtifacts(artifacts: 'pavics-sdi-*/docs/source/**/*.ipynb', fingerprint: true, excludes: 'pavics-sdi-*/docs/source/deprecated/**/*') + archiveArtifacts(artifacts: 'pavics-sdi-*/docs/source/notebooks/*.ipynb', fingerprint: true) + archiveArtifacts(artifacts: 'pavics-sdi-*/docs/source/notebook-components/*.ipynb', fingerprint: true) archiveArtifacts(artifacts: 'finch-*/docs/source/notebooks/*.ipynb', fingerprint: true) archiveArtifacts(artifacts: 'raven-*/docs/source/notebooks/*.ipynb', fingerprint: true) archiveArtifacts(artifacts: 'esgf-compute-api-*/examples/*.ipynb', fingerprint: true)