Revert "24.4.1"

danmcd · danmcd · commit c79aaa7edc7f · 2025-05-01T11:53:18.000-04:00
This reverts commit c08c8bc.
diff --git 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.1'
+                    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:x86_64 && image_ver:21.4.1'
+                    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:x86_64 && image_ver:21.4.1'
+                    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"
                 }
             }

Original file line number	Diff line number	Diff line change
`@@ -78,7 +78,7 @@ pipeline {`
`78`	`78`	`stage('check') {`
`79`	`79`	`agent {`
`80`	`80`	`node {`
`81`		`- label '!virt:kvm && !virt:bhyve && fs:pcfs && fs:ufs && jenkins_agent:3 && pkgsrc_arch:x86_64 && image_ver:21.4.1'`
	`81`	`+ label '!virt:kvm && !virt:bhyve && fs:pcfs && fs:ufs && jenkins_agent:3 && pkgsrc_arch:x86_64 && image_ver:21.4.0'`
`82`	`82`	`customWorkspace "workspace/headnode-${BRANCH_NAME}-check"`
`83`	`83`	`}`
`84`	`84`	`}`
`@@ -116,7 +116,7 @@ make check`
`116`	`116`	`stage('default') {`
`117`	`117`	`agent {`
`118`	`118`	`node {`
`119`		`- label '!virt:kvm && !virt:bhyve && fs:pcfs && fs:ufs && jenkins_agent:3 && pkgsrc_arch:x86_64 && image_ver:21.4.1'`
	`119`	`+ label '!virt:kvm && !virt:bhyve && fs:pcfs && fs:ufs && jenkins_agent:3 && pkgsrc_arch:x86_64 && image_ver:21.4.0'`
`120`	`120`	`customWorkspace "workspace/headnode-${BRANCH_NAME}-default"`
`121`	`121`	`}`
`122`	`122`	`}`
`@@ -176,7 +176,7 @@ make print-STAMP all publish bits-upload-latest`
`176`	`176`	`stage('debug') {`
`177`	`177`	`agent {`
`178`	`178`	`node {`
`179`		`- label '!virt:kvm && !virt:bhyve && fs:pcfs && fs:ufs && jenkins_agent:3 && pkgsrc_arch:x86_64 && image_ver:21.4.1'`
	`179`	`+ label '!virt:kvm && !virt:bhyve && fs:pcfs && fs:ufs && jenkins_agent:3 && pkgsrc_arch:x86_64 && image_ver:21.4.0'`
`180`	`180`	`customWorkspace "workspace/headnode-${BRANCH_NAME}-debug"`
`181`	`181`	`}`
`182`	`182`	`}`