Switch to Heliosv3

Author: citrus-it

.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",

.github/buildomat/jobs/build-and-test-helios.sh

@@ -2,7 +2,7 @@
 #:
 #: name = "build-and-test (helios)"
 #: variety = "basic"
-#: target = "helios-2.0"
+#: target = "helios-3.0"
 #: rust_toolchain = true
 #: output_rules = [
 #:	"%/work/*",

.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/*",

.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 = []
 

.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 = []
 

.github/buildomat/jobs/package.sh

@@ -2,7 +2,7 @@
 #:
 #: name = "helios / package"
 #: variety = "basic"
-#: target = "helios-2.0"
+#: target = "helios-3.0"
 #: rust_toolchain = true
 #: output_rules = [
 #:	"=/work/package.tar.gz",

.github/buildomat/jobs/tuf-repo.sh

@@ -2,7 +2,7 @@
 #:
 #: name = "helios / build TUF repo"
 #: variety = "basic"
-#: target = "helios-2.0"
+#: target = "helios-3.0"
 #: rust_toolchain = true
 #: output_rules = [
 #:	"=/work/manifest.toml",

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 },
@@ -109,6 +109,23 @@ pub(crate) async fn push_incorporation_jobs(
     Ok(())
 }
 
+fn parse_version_id<P: AsRef<Path>>(path: P) -> io::Result<u32> {
+    let contents = fs::read_to_string(path)?;
+
+    let value = contents
+        .lines()
+        .find_map(|line| {
+            line.strip_prefix("VERSION_ID=").map(|v| v.trim_matches('"'))
+        })
+        .ok_or_else(|| {
+            io::Error::new(io::ErrorKind::InvalidData, "VERSION_ID not found")
+        })?;
+
+    value
+        .parse::<u32>()
+        .map_err(|e| io::Error::new(io::ErrorKind::InvalidData, e))
+}
+
 async fn generate_incorporation_manifest(
     logger: Logger,
     path: Utf8PathBuf,
@@ -119,9 +136,11 @@ async fn generate_incorporation_manifest(
         fmri: String,
     }
 
+    let dashrev = parse_version_id("/etc/os-release")?;
+
     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}-{dashrev}.0,5.11
 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