From f1ccc8bd352e9c40bb72bbd86027db4b52948e5f Mon Sep 17 00:00:00 2001 From: Kris Moore Date: Mon, 22 Jan 2024 11:45:28 -0500 Subject: [PATCH 1/3] Add Nightly Update File Location for ElectricEel --- jenkins/Publish-Update | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/jenkins/Publish-Update b/jenkins/Publish-Update index f4e3b23..0020267 100644 --- a/jenkins/Publish-Update +++ b/jenkins/Publish-Update @@ -13,7 +13,8 @@ pipeline { echo '*** Grabbing artifact from Build - TrueNAS SCALE (Incremental) ***' copyArtifacts filter: '**/*.update', fingerprintArtifacts: true, flatten: true, projectName: 'Build - TrueNAS SCALE (Incremental)', selector: lastSuccessful(), target: 'upload/files' copyArtifacts filter: '**/*.json', fingerprintArtifacts: true, flatten: true, projectName: 'Build - TrueNAS SCALE (Incremental)', selector: lastSuccessful(), target: 'upload/files' - sh 'scp upload/files/manifest.json upload/files/TrueNAS-SCALE-*.update scale@update-master.tn.ixsystems.net:/tank/www/scale/TrueNAS-SCALE-Dragonfish-Nightlies/' + sh 'ssh scale@update-master.tn.ixsystems.net mkdir -p /tank/www/scale/TrueNAS-SCALE-ElectricEel-Nightlies || true' + sh 'scp upload/files/manifest.json upload/files/TrueNAS-SCALE-*.update scale@update-master.tn.ixsystems.net:/tank/www/scale/TrueNAS-SCALE-ElectricEel-Nightlies/' sh 'rm -rf upload/files' } } From 1b0736ebf138d3127bb441d98ae34f65f10794f3 Mon Sep 17 00:00:00 2001 From: Kris Moore Date: Mon, 22 Jan 2024 11:47:34 -0500 Subject: [PATCH 2/3] Update Publish-ISO for ElectricEel --- jenkins/Publish-ISO | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/jenkins/Publish-ISO b/jenkins/Publish-ISO index 7521626..583be99 100644 --- a/jenkins/Publish-ISO +++ b/jenkins/Publish-ISO @@ -10,8 +10,8 @@ pipeline { echo '*** Grabbing artifact from Build - TrueNAS SCALE (Full - Nightly ISO) ***' copyArtifacts filter: '**/*.iso', fingerprintArtifacts: true, flatten: true, projectName: 'Build - TrueNAS SCALE (Full - Nightly ISO)', selector: lastSuccessful(), target: 'upload/files' copyArtifacts filter: '**/*.sha256', fingerprintArtifacts: true, flatten: true, projectName: 'Build - TrueNAS SCALE (Full - Nightly ISO)', selector: lastSuccessful(), target: 'upload/files' - sh 'ssh truenas@cdn1.tn.ixsystems.com mkdir -p /cdn/download.truenas.com/truenas-scale-dragonfish-nightly/ || true' - sh 'scp upload/files/TrueNAS-SCALE*.iso upload/files/TrueNAS-SCALE*.iso.sha256 truenas@cdn1.tn.ixsystems.com:/cdn/download.truenas.com/truenas-scale-dragonfish-nightly/' + sh 'ssh truenas@cdn1.tn.ixsystems.com mkdir -p /cdn/download.truenas.com/truenas-scale-electriceel-nightly/ || true' + sh 'scp upload/files/TrueNAS-SCALE*.iso upload/files/TrueNAS-SCALE*.iso.sha256 truenas@cdn1.tn.ixsystems.com:/cdn/download.truenas.com/truenas-scale-electriceel-nightly/' sh 'rm -rf upload/files' } } From 1465fc67a7214b193d0d833acf14087858e7dc8c Mon Sep 17 00:00:00 2001 From: Kris Moore Date: Mon, 22 Jan 2024 11:55:14 -0500 Subject: [PATCH 3/3] Remove the upload-packages step, aptly doesn't use them --- jenkins/Incremental-NoPublish | 5 ----- 1 file changed, 5 deletions(-) diff --git a/jenkins/Incremental-NoPublish b/jenkins/Incremental-NoPublish index 6ccf644..5f4f7e4 100644 --- a/jenkins/Incremental-NoPublish +++ b/jenkins/Incremental-NoPublish @@ -25,11 +25,6 @@ pipeline { sh 'cd ${BDIR} && make packages' } } - stage('Upload Packages') { - steps { - sh 'scp ${BDIR}/tmp/pkgdir/*.deb pkgupload@apt-mirror.tn.ixsystems.net:repo/' - } - } stage('Update') { steps { sh 'cd ${BDIR} && make update'