move CI images to helios-2.0

.github/buildomat/jobs/opte-api.sh

@@ -2,7 +2,7 @@
 #:
 #: name = "opte-api"
 #: variety = "basic"
-#: target = "helios"
+#: target = "helios-2.0"
 #: rust_toolchain = "nightly"
 #: output_rules = []
 #:

.github/buildomat/jobs/opte-ioctl.sh

@@ -2,7 +2,7 @@
 #:
 #: name = "opte-ioctl"
 #: variety = "basic"
-#: target = "helios"
+#: target = "helios-2.0"
 #: rust_toolchain = "nightly"
 #: output_rules = []
 #:

.github/buildomat/jobs/opte.sh

@@ -2,7 +2,7 @@
 #:
 #: name = "opte"
 #: variety = "basic"
-#: target = "helios"
+#: target = "helios-2.0"
 #: rust_toolchain = "nightly"
 #: output_rules = []
 #:

.github/buildomat/jobs/opteadm.sh

@@ -2,7 +2,7 @@
 #:
 #: name = "opteadm"
 #: variety = "basic"
-#: target = "helios"
+#: target = "helios-2.0"
 #: rust_toolchain = "nightly"
 #: output_rules = [
 #:   "=/work/debug/opteadm",

.github/buildomat/jobs/oxide-vpc.sh

@@ -2,7 +2,7 @@
 #:
 #: name = "oxide-vpc"
 #: variety = "basic"
-#: target = "helios"
+#: target = "helios-2.0"
 #: rust_toolchain = "nightly"
 #: output_rules = []
 #:

.github/buildomat/jobs/p5p.sh

@@ -2,7 +2,7 @@
 #:
 #: name = "opte-p5p"
 #: variety = "basic"
-#: target = "helios"
+#: target = "helios-2.0"
 #: rust_toolchain = "nightly"
 #: output_rules = [
 #:   "=/out/opte.p5p",

.github/buildomat/jobs/test.sh

@@ -2,12 +2,11 @@
 #:
 #: name = "test"
 #: variety = "basic"
-#: target = "lab-opte-0.22"
+#: target = "helios-2.0"
 #: rust_toolchain = "stable"
 #: output_rules = [
 #:   "/work/*.log",
 #: ]
-#: skip_clone = true
 #:
 #: [dependencies.xde]
 #: job = "opte-xde"
@@ -22,6 +21,8 @@
 
 set -o xtrace
 
+pfexec pkg install brand/sparse
+
 if [[ -z $BUILDOMAT_JOB_ID ]]; then
     echo Note: if you are running this locally, you must run the xde.sh job first
     echo to have the artifacts at the expected spot.

.github/buildomat/jobs/xde.sh

@@ -2,7 +2,7 @@
 #:
 #: name = "opte-xde"
 #: variety = "basic"
-#: target = "helios"
+#: target = "helios-2.0"
 #: rust_toolchain = "nightly"
 #: output_rules = [
 #:   "=/work/debug/xde.dbg",

xde-tests/src/lib.rs

@@ -17,7 +17,6 @@ use oxide_vpc::api::SNat4Cfg;
 use oxide_vpc::api::SetVirt2PhysReq;
 use oxide_vpc::api::Vni;
 use oxide_vpc::api::VpcCfg;
-use std::env;
 use std::process::Command;
 use ztest::*;
 
@@ -271,8 +270,5 @@ impl<'a> SoftnpuZone<'a> {
 // this is running locally, use a sparse zone which is much easier to set up on
 // a regular Helios dev box.
 pub fn brand() -> &'static str {
-    match env::var("BUILDOMAT_JOB_ID") {
-        Ok(_) => "omicron1",
-        _ => "sparse",
-    }
+    "sparse"
 }