oxidecomputer · citrus-it · Mar 13, 2026
diff --git a/.github/buildomat/jobs/a4x2-prepare.sh b/.github/buildomat/jobs/a4x2-prepare.sh
@@ -2,7 +2,7 @@
 #:
 #: name = "a4x2-prepare"
 #: variety = "basic"
-#: target = "helios-2.0"
+#: target = "helios-3.0"
 #: rust_toolchain = true
 #: output_rules = [
 #:	"=/out/cargo-bay-ce.tgz",

diff --git a/.github/buildomat/jobs/build-and-test-helios.sh b/.github/buildomat/jobs/build-and-test-helios.sh
@@ -2,7 +2,7 @@
 #:
 #: name = "build-and-test (helios)"
 #: variety = "basic"
-#: target = "helios-2.0-32c256gb"
+#: target = "helios-3.0-32c256gb"
 #: rust_toolchain = true
 #: output_rules = [
 #:	"%/work/*",

diff --git a/.github/buildomat/jobs/check-features.sh b/.github/buildomat/jobs/check-features.sh
@@ -2,7 +2,7 @@
 #:
 #: name = "check-features (helios)"
 #: variety = "basic"
-#: target = "helios-2.0"
+#: target = "helios-3.0"
 #: rust_toolchain = true
 #: output_rules = [
 #:  "/out/*",

diff --git a/.github/buildomat/jobs/clippy.sh b/.github/buildomat/jobs/clippy.sh
@@ -2,7 +2,7 @@
 #:
 #: name = "clippy (helios)"
 #: variety = "basic"
-#: target = "helios-2.0"
+#: target = "helios-3.0"
 #: rust_toolchain = true
 #: output_rules = []
 

diff --git a/.github/buildomat/jobs/omicron-common.sh b/.github/buildomat/jobs/omicron-common.sh
@@ -2,7 +2,7 @@
 #:
 #: name = "omicron-common (helios)"
 #: variety = "basic"
-#: target = "helios-2.0"
+#: target = "helios-3.0"
 #: rust_toolchain = true
 #: output_rules = []
 

diff --git a/.github/buildomat/jobs/package.sh b/.github/buildomat/jobs/package.sh
@@ -2,7 +2,7 @@
 #:
 #: name = "helios / package"
 #: variety = "basic"
-#: target = "helios-2.0-16c64gb"
+#: target = "helios-3.0-16c64gb"
 #: rust_toolchain = true
 #: output_rules = [
 #:	"=/work/package.tar.gz",

diff --git a/.github/buildomat/jobs/tuf-repo.sh b/.github/buildomat/jobs/tuf-repo.sh
@@ -2,7 +2,7 @@
 #:
 #: name = "helios / build TUF repo"
 #: variety = "basic"
-#: target = "helios-2.0-16c128gb"
+#: target = "helios-3.0-16c128gb"
 #: rust_toolchain = true
 #: output_rules = [
 #:	"=/work/manifest.toml",

diff --git a/dev-tools/releng/src/helios.rs b/dev-tools/releng/src/helios.rs
@@ -23,7 +23,7 @@ const MANIFEST_PATH: &str = "incorporation.p5m";
 const REPO_PATH: &str = "incorporation";
 pub const ARCHIVE_PATH: &str = "incorporation.p5p";
 
-pub const PUBLISHER: &str = "helios-dev";
+pub const PUBLISHER: &str = "helios";
 
 pub(crate) enum Action {
     Generate { version: String },
@@ -119,9 +119,25 @@ async fn generate_incorporation_manifest(
         fmri: String,
     }
 
+    let stdout = Command::new("pkg")
+        .args([
+            "list",
+            "-H",
+            "-o",
+            "branch",
+            "-n",
+            "-g",
+            HELIOS_PKGREPO,
+            "release/name",
+        ])
+        .ensure_stdout(&logger)
+        .await?;
+
+    let branch = stdout.trim();
+
     let mut manifest = BufWriter::new(File::create(path).await?);
     let preamble = format!(
-        r#"set name=pkg.fmri value=pkg://{PUBLISHER}/{INCORP_NAME}@{version},5.11
+        r#"set name=pkg.fmri value=pkg://{PUBLISHER}/{INCORP_NAME}@{version},5.11-{branch}
 set name=pkg.summary value="Incorporation to constrain software delivered in Omicron Release V{version} images"
 set name=info.classification value="org.opensolaris.category.2008:Meta Packages/Incorporations"
 set name=variant.opensolaris.zone value=global value=nonglobal

diff --git a/dev-tools/releng/src/main.rs b/dev-tools/releng/src/main.rs
@@ -91,7 +91,7 @@ const TUF_PACKAGES: [&PackageName; 12] = [
     &PackageName::new_const("probe"),
 ];
 
-const HELIOS_PKGREPO: &str = "https://pkg.oxide.computer/helios/2/dev/";
+const HELIOS_PKGREPO: &str = "https://pkg.oxide.computer/helios/3/dev/";
 const HELIOS_REPO: &str = "https://github.com/oxidecomputer/helios.git";
 
 static WORKSPACE_DIR: LazyLock<Utf8PathBuf> = LazyLock::new(|| {
@@ -158,7 +158,7 @@ struct Args {
     #[clap(long)]
     extra_manifest: Option<Utf8PathBuf>,
 
-    /// Extra helios-dev origin to be passed along to helios-build
+    /// Extra helios origin to be passed along to helios-build
     #[clap(long)]
     extra_origin: Option<String>,
 
@@ -422,6 +422,14 @@ async fn main() -> Result<()> {
         .context("failed to create temporary directory")?;
     let mut jobs = Jobs::new(&logger, permits.clone(), &args.output_dir);
 
+    // XXX - temporary
+    jobs.push_command(
+        "switch-branch",
+        Command::new("git")
+            .args(["switch", "helios3"])
+            .current_dir(&args.helios_dir),
+    );
+
     jobs.push_command(
         "helios-setup",
         Command::new("ptime")
@@ -672,7 +680,7 @@ async fn main() -> Result<()> {
         if !args.helios_local {
             image_cmd = image_cmd
                 .arg("-p") // use an external package repository
-                .arg(format!("helios-dev={HELIOS_PKGREPO}"))
+                .arg(format!("helios={HELIOS_PKGREPO}"))
         }
 
         // helios-build experiment-image

diff --git a/tools/install_opte.sh b/tools/install_opte.sh
@@ -73,7 +73,7 @@ fi
 
 # Actually install the xde kernel module and opteadm tool
 RC=0
-pfexec pkg install -v pkg://helios-dev/driver/network/opte@"$OPTE_VERSION" || RC=$?
+pfexec pkg install -v pkg://helios/driver/network/opte@"$OPTE_VERSION" || RC=$?
 if [[ "$RC" -eq 0 ]]; then
     echo "xde driver installed successfully"
 elif [[ "$RC" -eq 4 ]]; then

diff --git a/tools/scrimlet/create-softnpu-zone.sh b/tools/scrimlet/create-softnpu-zone.sh
@@ -12,7 +12,7 @@ cp out/softnpu/scadm /opt/oxide/softnpu/stuff/
 
 zfs create -p -o mountpoint=/softnpu-zone rpool/softnpu-zone
 
-pkg set-publisher --search-first helios-dev
+pkg set-publisher --search-first helios
 
 zonecfg -z softnpu -f tools/scrimlet/softnpu-zone.txt
 zoneadm -z softnpu install

diff --git a/tools/uninstall_opte.sh b/tools/uninstall_opte.sh
@@ -28,7 +28,7 @@ fi
 PUBLISHERS=("on-nightly" "helios-netdev")
 
 # The stock Helios publisher and incorporation base information to revert to
-HELIOS_PUBLISHER="helios-dev"
+HELIOS_PUBLISHER="helios"
 STOCK_CONSOLIDATION="pkg://$HELIOS_PUBLISHER/consolidation/osnet/osnet-incorporation"
 
 # Saved list of publisher origins we've removed if we need to restore them
@@ -71,7 +71,7 @@ function restore_removed_publishers {
     done
 }
 
-# Install stock incorporation from helios-dev, pushing the publisher to the top
+# Install stock incorporation from helios, pushing the publisher to the top
 function to_stock_helios {
     local CONSOLIDATION="$1"
     echo "Installing stock Helios kernel and networking bits"
@@ -125,7 +125,7 @@ function to_stock_helios {
     pkg install --no-refresh -v "${REJECT_ARGS[@]}" "$CONSOLIDATION"
 }
 
-# If helios-dev exists, echo the full osnet-incorporation package we'll be
+# If helios exists, echo the full osnet-incorporation package we'll be
 # installing to. If it does _not_ exist, fail.
 function ensure_helios_publisher_exists {
     pkg publisher "$HELIOS_PUBLISHER" > /dev/null || \
@@ -135,8 +135,8 @@ function ensure_helios_publisher_exists {
         echo "No osnet-incorporation package exists on this system,"
         echo "so we cannot determine the exact package to install"
         echo "to revert to stock Helios. You may need to update your"
-        echo "helios-dev publisher to refresh that publishers list of"
-        echo "available packages, with \"pkg refresh helios-dev\""
+        echo "helios publisher to refresh that publishers list of"
+        echo "available packages, with \"pkg refresh helios\""
         exit 1
     fi
     echo "$CONSOLIDATION" | tr -s ' ' | awk '{ print $1 "@" $(NF-1); }'