Skip to content

Use 2024.4 #92

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
danmcd wants to merge 1 commit into
base: master
Choose a base branch
from
+13 −5
Open

Use 2024.4 #92

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 7 additions & 3 deletions Jenkinsfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@
/*
* Copyright 2022 Joyent, Inc.
* Copyright 2025 MNX Cloud, Inc.
* Copyright 2026 Edgecast Cloud LLC.
*/

@Library('jenkins-joylib@v1.0.8') _
Expand Down Expand Up @@ -78,7 +79,8 @@ pipeline {
stage('check') {
agent {
node {
label '!virt:kvm && !virt:bhyve && fs:pcfs && fs:ufs && jenkins_agent:3 && pkgsrc_arch:multiarch'
label 'image_ver:24.4.1 && !virt:kvm && !virt:bhyve && ' +
'fs:pcfs && fs:ufs && jenkins_agent:3 && pkgsrc_arch:x86_64'
customWorkspace "workspace/headnode-${BRANCH_NAME}-check"
}
}
Expand Down Expand Up @@ -116,7 +118,8 @@ make check
stage('default') {
agent {
node {
label '!virt:kvm && !virt:bhyve && fs:pcfs && fs:ufs && jenkins_agent:3 && pkgsrc_arch:multiarch'
label 'platform:true && !virt:kvm && !virt:bhyve && ' +
'fs:pcfs && fs:ufs && jenkins_agent:3 && pkgsrc_arch:x86_64'
customWorkspace "workspace/headnode-${BRANCH_NAME}-default"
}
}
Expand Down Expand Up @@ -176,7 +179,8 @@ 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 'platform:true && !virt:kvm && !virt:bhyve && ' +
'fs:pcfs && fs:ufs && jenkins_agent:3 && pkgsrc_arch:x86_64'
customWorkspace "workspace/headnode-${BRANCH_NAME}-debug"
}
}
Expand Down
4 changes: 4 additions & 0 deletions bin/build-image
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@

#
# Copyright 2021 Joyent, Inc.
# Copyright 2026 Edgecast Cloud LLC.
#

ROOT=$(cd $(dirname $0)/../ >/dev/null; pwd)
Expand Down Expand Up @@ -54,6 +55,9 @@ tar|usb|coal|dataset|iso|ipxe)
esac
export TYPE

# Make sure we have npm installed.
pkgin install nodejs

if [[ ${TYPE} != "dataset" || -z $(ls -1dt $ROOT/usb-* | head -1) ]]; then
$ROOT/bin/build-tar-image
[[ "$TYPE" == "tar" ]] && exit 0
Expand Down
4 changes: 2 additions & 2 deletions scripts/prompt-config.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
#
# Copyright 2022 Joyent, Inc.
# Copyright 2025 MNX Cloud, Inc.
# Copyright 2025 Edgecast Cloud LLC.
# Copyright 2026 Edgecast Cloud LLC.
#

# XXX - TODO
Expand Down Expand Up @@ -887,7 +887,7 @@ export TERM=xterm-color

trap sig_doshell SIGINT

printheader "Copyright 2025 Edgecast Cloud"
printheader "Copyright 2026 Edgecast Cloud"

message="
Before proceeding with the installation of Triton please familiarise yourself
Expand Down