move disttag to per profile

This commit is contained in:
Louis Abel 2022-10-20 01:17:25 -07:00
parent afb3576a3d
commit 4d6a0c9519
Signed by untrusted user: label
GPG Key ID: B37E62D143879B36
9 changed files with 13 additions and 3 deletions

View File

@ -5,7 +5,9 @@
1. Install [Poetry](https://python-poetry.org/docs/) 1. Install [Poetry](https://python-poetry.org/docs/)
2. Setup: `poetry install` 2. Setup: `poetry install`
3. Install dependencies: `dnf install podman mock` 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 ## 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 * build-image -> Runs build-iso
* generate_compose -> Creates a compose directory right away and optionally links it as latest * 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) (You should only use this if you are running into errors with images)
* peridot_repoclosure -> Runs repoclosure against a peridot instance
``` ```
## wrappers ## wrappers

View File

@ -6,6 +6,7 @@
major: '8' major: '8'
minor: '7' minor: '7'
profile: '8' profile: '8'
disttag: 'el8'
bugurl: 'https://bugs.rockylinux.org' bugurl: 'https://bugs.rockylinux.org'
checksum: 'sha256' checksum: 'sha256'
fedora_major: '20' fedora_major: '20'

View File

@ -6,6 +6,7 @@
major: '8' major: '8'
minor: '6' minor: '6'
profile: '8' profile: '8'
disttag: 'el8'
bugurl: 'https://bugs.rockylinux.org' bugurl: 'https://bugs.rockylinux.org'
checksum: 'sha256' checksum: 'sha256'
fedora_major: '20' fedora_major: '20'

View File

@ -6,6 +6,7 @@
major: '8' major: '8'
minor: '8' minor: '8'
profile: '8' profile: '8'
disttag: 'el8'
bugurl: 'https://bugs.rockylinux.org' bugurl: 'https://bugs.rockylinux.org'
checksum: 'sha256' checksum: 'sha256'
fedora_major: '20' fedora_major: '20'

View File

@ -6,6 +6,7 @@
major: '9' major: '9'
minor: '1' minor: '1'
profile: '9-beta' profile: '9-beta'
disttag: 'el9'
bugurl: 'https://bugs.rockylinux.org' bugurl: 'https://bugs.rockylinux.org'
checksum: 'sha256' checksum: 'sha256'
fedora_major: '20' fedora_major: '20'

View File

@ -6,6 +6,7 @@
major: '9' major: '9'
minor: '0' minor: '0'
profile: '9' profile: '9'
disttag: 'el9'
bugurl: 'https://bugs.rockylinux.org' bugurl: 'https://bugs.rockylinux.org'
checksum: 'sha256' checksum: 'sha256'
fedora_major: '20' fedora_major: '20'

View File

@ -7,6 +7,7 @@
major: '9' major: '9'
minor: '0' minor: '0'
profile: '9' profile: '9'
disttag: 'el9'
bugurl: 'https://bugs.rockylinux.org' bugurl: 'https://bugs.rockylinux.org'
checksum: 'sha256' checksum: 'sha256'
fedora_major: '20' fedora_major: '20'

View File

@ -6,6 +6,7 @@
major: '9' major: '9'
minor: '2' minor: '2'
profile: '9-lookahead' profile: '9-lookahead'
disttag: 'el9'
bugurl: 'https://bugs.rockylinux.org' bugurl: 'https://bugs.rockylinux.org'
checksum: 'sha256' checksum: 'sha256'
fedora_major: '20' fedora_major: '20'

View File

@ -73,7 +73,7 @@ class IsoBuild:
# Relevant config items # Relevant config items
self.major_version = major self.major_version = major
self.compose_dir_is_here = compose_dir_is_here self.compose_dir_is_here = compose_dir_is_here
self.disttag = config['dist'] self.disttag = rlvars['disttag']
self.date_stamp = config['date_stamp'] self.date_stamp = config['date_stamp']
self.timestamp = time.time() self.timestamp = time.time()
self.compose_root = config['compose_root'] self.compose_root = config['compose_root']
@ -1539,7 +1539,7 @@ class LiveBuild:
self.minor_version = rlvars['minor'] self.minor_version = rlvars['minor']
self.revision = rlvars['revision'] + "-" + rlvars['rclvl'] self.revision = rlvars['revision'] + "-" + rlvars['rclvl']
self.rclvl = rlvars['rclvl'] self.rclvl = rlvars['rclvl']
self.disttag = config['dist'] self.disttag = rlvars['disttag']
self.repos = rlvars['iso_map']['lorax']['repos'] self.repos = rlvars['iso_map']['lorax']['repos']
self.repo_base_url = config['repo_base_url'] self.repo_base_url = config['repo_base_url']
self.project_id = rlvars['project_id'] self.project_id = rlvars['project_id']