From 4d6a0c9519e3623d5febe9ce4da653fe4c98c7ed Mon Sep 17 00:00:00 2001 From: Louis Abel Date: Thu, 20 Oct 2022 01:17:25 -0700 Subject: [PATCH] move disttag to per profile --- iso/empanadas/README.md | 5 ++++- iso/empanadas/empanadas/configs/el8-beta.yaml | 1 + iso/empanadas/empanadas/configs/el8.yaml | 1 + iso/empanadas/empanadas/configs/el8lh.yaml | 1 + iso/empanadas/empanadas/configs/el9-beta.yaml | 1 + iso/empanadas/empanadas/configs/el9.yaml | 1 + iso/empanadas/empanadas/configs/el9alt.yaml | 1 + iso/empanadas/empanadas/configs/el9lh.yaml | 1 + iso/empanadas/empanadas/util/iso_utils.py | 4 ++-- 9 files changed, 13 insertions(+), 3 deletions(-) diff --git a/iso/empanadas/README.md b/iso/empanadas/README.md index 5058d5f..e8b3548 100644 --- a/iso/empanadas/README.md +++ b/iso/empanadas/README.md @@ -5,7 +5,9 @@ 1. Install [Poetry](https://python-poetry.org/docs/) 2. Setup: `poetry install` 3. Install dependencies: `dnf install podman mock` -3. Have fun +4. Have fun + +Deeper documenation can be found at the [SIG/Core Wiki](https://sig-core.rocky.page/documentation). ## Reliance on podman and mock @@ -43,6 +45,7 @@ Changes to the poetry.lock should be commited if dependencies are added or updat * build-image -> Runs build-iso * generate_compose -> Creates a compose directory right away and optionally links it as latest (You should only use this if you are running into errors with images) +* peridot_repoclosure -> Runs repoclosure against a peridot instance ``` ## wrappers diff --git a/iso/empanadas/empanadas/configs/el8-beta.yaml b/iso/empanadas/empanadas/configs/el8-beta.yaml index f3e2b4c..607cc81 100644 --- a/iso/empanadas/empanadas/configs/el8-beta.yaml +++ b/iso/empanadas/empanadas/configs/el8-beta.yaml @@ -6,6 +6,7 @@ major: '8' minor: '7' profile: '8' + disttag: 'el8' bugurl: 'https://bugs.rockylinux.org' checksum: 'sha256' fedora_major: '20' diff --git a/iso/empanadas/empanadas/configs/el8.yaml b/iso/empanadas/empanadas/configs/el8.yaml index ce38438..363f081 100644 --- a/iso/empanadas/empanadas/configs/el8.yaml +++ b/iso/empanadas/empanadas/configs/el8.yaml @@ -6,6 +6,7 @@ major: '8' minor: '6' profile: '8' + disttag: 'el8' bugurl: 'https://bugs.rockylinux.org' checksum: 'sha256' fedora_major: '20' diff --git a/iso/empanadas/empanadas/configs/el8lh.yaml b/iso/empanadas/empanadas/configs/el8lh.yaml index e233384..5de2c9e 100644 --- a/iso/empanadas/empanadas/configs/el8lh.yaml +++ b/iso/empanadas/empanadas/configs/el8lh.yaml @@ -6,6 +6,7 @@ major: '8' minor: '8' profile: '8' + disttag: 'el8' bugurl: 'https://bugs.rockylinux.org' checksum: 'sha256' fedora_major: '20' diff --git a/iso/empanadas/empanadas/configs/el9-beta.yaml b/iso/empanadas/empanadas/configs/el9-beta.yaml index 2fe24a4..33ff506 100644 --- a/iso/empanadas/empanadas/configs/el9-beta.yaml +++ b/iso/empanadas/empanadas/configs/el9-beta.yaml @@ -6,6 +6,7 @@ major: '9' minor: '1' profile: '9-beta' + disttag: 'el9' bugurl: 'https://bugs.rockylinux.org' checksum: 'sha256' fedora_major: '20' diff --git a/iso/empanadas/empanadas/configs/el9.yaml b/iso/empanadas/empanadas/configs/el9.yaml index d586ff8..69f1c30 100644 --- a/iso/empanadas/empanadas/configs/el9.yaml +++ b/iso/empanadas/empanadas/configs/el9.yaml @@ -6,6 +6,7 @@ major: '9' minor: '0' profile: '9' + disttag: 'el9' bugurl: 'https://bugs.rockylinux.org' checksum: 'sha256' fedora_major: '20' diff --git a/iso/empanadas/empanadas/configs/el9alt.yaml b/iso/empanadas/empanadas/configs/el9alt.yaml index 680b1df..01d81e1 100644 --- a/iso/empanadas/empanadas/configs/el9alt.yaml +++ b/iso/empanadas/empanadas/configs/el9alt.yaml @@ -7,6 +7,7 @@ major: '9' minor: '0' profile: '9' + disttag: 'el9' bugurl: 'https://bugs.rockylinux.org' checksum: 'sha256' fedora_major: '20' diff --git a/iso/empanadas/empanadas/configs/el9lh.yaml b/iso/empanadas/empanadas/configs/el9lh.yaml index 953b5ac..7749b93 100644 --- a/iso/empanadas/empanadas/configs/el9lh.yaml +++ b/iso/empanadas/empanadas/configs/el9lh.yaml @@ -6,6 +6,7 @@ major: '9' minor: '2' profile: '9-lookahead' + disttag: 'el9' bugurl: 'https://bugs.rockylinux.org' checksum: 'sha256' fedora_major: '20' diff --git a/iso/empanadas/empanadas/util/iso_utils.py b/iso/empanadas/empanadas/util/iso_utils.py index 9d9faa2..85757b0 100644 --- a/iso/empanadas/empanadas/util/iso_utils.py +++ b/iso/empanadas/empanadas/util/iso_utils.py @@ -73,7 +73,7 @@ class IsoBuild: # Relevant config items self.major_version = major self.compose_dir_is_here = compose_dir_is_here - self.disttag = config['dist'] + self.disttag = rlvars['disttag'] self.date_stamp = config['date_stamp'] self.timestamp = time.time() self.compose_root = config['compose_root'] @@ -1539,7 +1539,7 @@ class LiveBuild: self.minor_version = rlvars['minor'] self.revision = rlvars['revision'] + "-" + rlvars['rclvl'] self.rclvl = rlvars['rclvl'] - self.disttag = config['dist'] + self.disttag = rlvars['disttag'] self.repos = rlvars['iso_map']['lorax']['repos'] self.repo_base_url = config['repo_base_url'] self.project_id = rlvars['project_id']