From 5f8ff1fa23ab17f900be2b435b337cac79b851b1 Mon Sep 17 00:00:00 2001 From: Jonathan Lebon Date: Thu, 12 Dec 2024 16:42:26 -0500 Subject: [PATCH] el-only variants: drop pungi-related comments It was an aspiration at the beginning of this effort to try to think of these streams as kind of follow-on jobs to pungi composes that happen in CentOS Stream and RHEL. And so I had an idea of matching exactly the Pungi compose ID we were composing from to reinforce that. In practice, it was quite awkward to query compose IDs and also do it in a race-free way. It didn't seem worth the added complexity, so I backed it out. It's also currently not clear what the future of Pungi is. So let's just remove the comments related to it. --- manifest-c9s.yaml | 3 --- manifest-rhel-9.4.yaml | 3 --- manifest-rhel-9.6.yaml | 3 --- 3 files changed, 9 deletions(-) diff --git a/manifest-c9s.yaml b/manifest-c9s.yaml index ecbfabc6..775e80a6 100644 --- a/manifest-c9s.yaml +++ b/manifest-c9s.yaml @@ -18,9 +18,6 @@ repos: - c9s-baseos - c9s-appstream -# Eventually we should try to build these images as part of the c9s composes. -# In that case, the versioning should instead be exactly the same as the pungi -# compose ID. automatic-version-prefix: "9.0." # This ensures we're semver-compatible which OpenShift wants automatic-version-suffix: "-" diff --git a/manifest-rhel-9.4.yaml b/manifest-rhel-9.4.yaml index 4c0d9f61..4139a7bc 100644 --- a/manifest-rhel-9.4.yaml +++ b/manifest-rhel-9.4.yaml @@ -17,9 +17,6 @@ repos: - rhel-9.4-baseos - rhel-9.4-appstream -# Eventually we should try to build these images as part of the RHEL composes. -# In that case, the versioning should instead be exactly the same as the pungi -# compose ID. automatic-version-prefix: "9.4." # This ensures we're semver-compatible which OpenShift wants automatic-version-suffix: "-" diff --git a/manifest-rhel-9.6.yaml b/manifest-rhel-9.6.yaml index 58351032..1ac3f010 100644 --- a/manifest-rhel-9.6.yaml +++ b/manifest-rhel-9.6.yaml @@ -17,9 +17,6 @@ repos: - rhel-9.6-baseos - rhel-9.6-appstream -# Eventually we should try to build these images as part of the RHEL composes. -# In that case, the versioning should instead be exactly the same as the pungi -# compose ID. automatic-version-prefix: "9.6." # This ensures we're semver-compatible which OpenShift wants automatic-version-suffix: "-"