From 1485fdb3abae8f7068c23d102b9cfb46a10d6426 Mon Sep 17 00:00:00 2001 From: Dan McDonald Date: Sun, 22 May 2022 15:53:08 -0400 Subject: [PATCH 1/3] TRITON-xxxx Move sdc-headnode builds to 2021.4 --- Jenkinsfile | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index 8aa088c6..b92f618f 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -78,7 +78,7 @@ pipeline { stage('check') { agent { node { - label '!virt:kvm && !virt:bhyve && fs:pcfs && fs:ufs && jenkins_agent:3 && pkgsrc_arch:multiarch' + label '!virt:kvm && !virt:bhyve && fs:pcfs && fs:ufs && jenkins_agent:3 && pkgsrc_arch:x86_64 && image_ver:21.4.0' customWorkspace "workspace/headnode-${BRANCH_NAME}-check" } } @@ -116,7 +116,7 @@ make check stage('default') { agent { node { - label '!virt:kvm && !virt:bhyve && fs:pcfs && fs:ufs && jenkins_agent:3 && pkgsrc_arch:multiarch' + label '!virt:kvm && !virt:bhyve && fs:pcfs && fs:ufs && jenkins_agent:3 && pkgsrc_arch:x86_64 && image_ver:21.4.0' customWorkspace "workspace/headnode-${BRANCH_NAME}-default" } } @@ -176,7 +176,7 @@ make print-STAMP all publish bits-upload-latest stage('debug') { agent { node { - label '!virt:kvm && !virt:bhyve && fs:pcfs && fs:ufs && jenkins_agent:3 && pkgsrc_arch:multiarch' + label '!virt:kvm && !virt:bhyve && fs:pcfs && fs:ufs && jenkins_agent:3 && pkgsrc_arch:x86_64 && image_ver:21.4.0' customWorkspace "workspace/headnode-${BRANCH_NAME}-debug" } } From 83120591dada8b27985117a0b38474e5f30649b4 Mon Sep 17 00:00:00 2001 From: Dan McDonald Date: Sun, 22 May 2022 16:18:48 -0400 Subject: [PATCH 2/3] Brie's code review fix --- Jenkinsfile | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index b92f618f..2ddf1c6c 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -83,7 +83,7 @@ pipeline { } } tools { - nodejs 'sdcnode-v6-zone' + nodejs 'sdcnode-v6-zone64' } steps{ sh(''' @@ -133,7 +133,7 @@ make check } } tools { - nodejs 'sdcnode-v6-zone' + nodejs 'sdcnode-v6-zone64' } steps { sh('git clean -fdx') @@ -189,7 +189,7 @@ make print-STAMP all publish bits-upload-latest } } tools { - nodejs 'sdcnode-v6-zone' + nodejs 'sdcnode-v6-zone64' } steps { sh('git clean -fdx') From e6e297dfb7ec4616763b47b929ba9ff8b3810477 Mon Sep 17 00:00:00 2001 From: Dan McDonald Date: Tue, 22 Nov 2022 16:08:23 -0500 Subject: [PATCH 3/3] 24.4.1 --- Jenkinsfile | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index 2ddf1c6c..d4fd29f9 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -78,7 +78,7 @@ pipeline { stage('check') { agent { node { - label '!virt:kvm && !virt:bhyve && fs:pcfs && fs:ufs && jenkins_agent:3 && pkgsrc_arch:x86_64 && image_ver:21.4.0' + label '!virt:kvm && !virt:bhyve && fs:pcfs && fs:ufs && jenkins_agent:3 && pkgsrc_arch:x86_64 && image_ver:24.4.1' customWorkspace "workspace/headnode-${BRANCH_NAME}-check" } } @@ -116,7 +116,7 @@ make check stage('default') { agent { node { - label '!virt:kvm && !virt:bhyve && fs:pcfs && fs:ufs && jenkins_agent:3 && pkgsrc_arch:x86_64 && image_ver:21.4.0' + label '!virt:kvm && !virt:bhyve && fs:pcfs && fs:ufs && jenkins_agent:3 && pkgsrc_arch:x86_64 && image_ver:24.4.1' customWorkspace "workspace/headnode-${BRANCH_NAME}-default" } } @@ -176,7 +176,7 @@ make print-STAMP all publish bits-upload-latest stage('debug') { agent { node { - label '!virt:kvm && !virt:bhyve && fs:pcfs && fs:ufs && jenkins_agent:3 && pkgsrc_arch:x86_64 && image_ver:21.4.0' + label '!virt:kvm && !virt:bhyve && fs:pcfs && fs:ufs && jenkins_agent:3 && pkgsrc_arch:x86_64 && image_ver:24.4.1' customWorkspace "workspace/headnode-${BRANCH_NAME}-debug" } }