Skip to content

Commit 9ce3f6b

Browse files
committed
CNF-18558: Integrate rpm lockfile scripts
- Integrate rhel9 lock file generation using RHEL images from the containerfile - We do need subscriptions for this as the packages we need are in the rhel9 repos - Update .gitignore files for the lock directories to account for the new generated and temporary files - Replace `redhat.repo` configuration with embeded repos in the rpm.in.yaml file for ztp Assisted-by: Cursor/claude-4-sonnet AI-attribution: AIA,Primarily human-created,Human-initiated,Reviewed,Cursor/claude-4-sonnet,v1.0 For more information on AI attribution statements, see: https://aiattribution.github.io/
1 parent 7093b13 commit 9ce3f6b

File tree

9 files changed

+929
-796
lines changed

9 files changed

+929
-796
lines changed

.konflux/lock-build/.gitignore

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
Dockerfile
2+
podman_script.sh
3+
redhat.repo
4+
rpms.out.yaml

.konflux/lock-build/redhat.repo

Lines changed: 0 additions & 51 deletions
This file was deleted.

.konflux/lock-build/rpms.in.yaml

Lines changed: 86 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,12 +3,94 @@ arches:
33
- x86_64
44
- aarch64
55
contentOrigin:
6-
repofiles:
7-
# rhel9 rpm repos
8-
- ./redhat.repo
6+
repos:
7+
- repoid: rhel-9-for-x86_64-appstream-rpms
8+
name: Red Hat Enterprise Linux 9 for x86_64 - AppStream (RPMs)
9+
baseurl: https://cdn.redhat.com/content/dist/rhel9/{version}/x86_64/appstream/os
10+
enabled: "1"
11+
gpgcheck: "1"
12+
gpgkey: file:///etc/pki/rpm-gpg/RPM-GPG-KEY-redhat-release
13+
sslverify: "1"
14+
sslcacert: /etc/rhsm/ca/redhat-uep.pem
15+
sslclientkey: /etc/pki/entitlement/placeholder-key.pem
16+
sslclientcert: /etc/pki/entitlement/placeholder.pem
17+
sslverifystatus: "1"
18+
metadata_expire: "86400"
19+
enabled_metadata: "1"
20+
varsFromContainerfile: Dockerfile
21+
- repoid: rhel-9-for-x86_64-baseos-rpms
22+
name: Red Hat Enterprise Linux 9 for x86_64 - BaseOS (RPMs)
23+
baseurl: https://cdn.redhat.com/content/dist/rhel9/{version}/x86_64/baseos/os
24+
enabled: "1"
25+
gpgcheck: "1"
26+
gpgkey: file:///etc/pki/rpm-gpg/RPM-GPG-KEY-redhat-release
27+
sslverify: "1"
28+
sslcacert: /etc/rhsm/ca/redhat-uep.pem
29+
sslclientkey: /etc/pki/entitlement/placeholder-key.pem
30+
sslclientcert: /etc/pki/entitlement/placeholder.pem
31+
sslverifystatus: "1"
32+
metadata_expire: "86400"
33+
enabled_metadata: "1"
34+
varsFromContainerfile: Dockerfile
35+
- repoid: codeready-builder-for-rhel-9-x86_64-rpms
36+
name: Red Hat CodeReady Linux Builder for RHEL 9 x86_64 (RPMs)
37+
baseurl: https://cdn.redhat.com/content/dist/rhel9/{version}/x86_64/codeready-builder/os
38+
enabled: "1"
39+
gpgcheck: "1"
40+
gpgkey: file:///etc/pki/rpm-gpg/RPM-GPG-KEY-redhat-release
41+
sslverify: "1"
42+
sslcacert: /etc/rhsm/ca/redhat-uep.pem
43+
sslclientkey: /etc/pki/entitlement/placeholder-key.pem
44+
sslclientcert: /etc/pki/entitlement/placeholder.pem
45+
sslverifystatus: "1"
46+
metadata_expire: "86400"
47+
enabled_metadata: "1"
48+
varsFromContainerfile: Dockerfile
49+
- repoid: rhel-9-for-aarch64-appstream-rpms
50+
name: Red Hat Enterprise Linux 9 for aarch64 - AppStream (RPMs)
51+
baseurl: https://cdn.redhat.com/content/dist/rhel9/{version}/aarch64/appstream/os
52+
enabled: "1"
53+
gpgcheck: "1"
54+
gpgkey: file:///etc/pki/rpm-gpg/RPM-GPG-KEY-redhat-release
55+
sslverify: "1"
56+
sslcacert: /etc/rhsm/ca/redhat-uep.pem
57+
sslclientkey: /etc/pki/entitlement/placeholder-key.pem
58+
sslclientcert: /etc/pki/entitlement/placeholder.pem
59+
sslverifystatus: "1"
60+
metadata_expire: "86400"
61+
enabled_metadata: "1"
62+
varsFromContainerfile: Dockerfile
63+
- repoid: rhel-9-for-aarch64-baseos-rpms
64+
name: Red Hat Enterprise Linux 9 for aarch64 - BaseOS (RPMs)
65+
baseurl: https://cdn.redhat.com/content/dist/rhel9/{version}/aarch64/baseos/os
66+
enabled: "1"
67+
gpgcheck: "1"
68+
gpgkey: file:///etc/pki/rpm-gpg/RPM-GPG-KEY-redhat-release
69+
sslverify: "1"
70+
sslcacert: /etc/rhsm/ca/redhat-uep.pem
71+
sslclientkey: /etc/pki/entitlement/placeholder-key.pem
72+
sslclientcert: /etc/pki/entitlement/placeholder.pem
73+
sslverifystatus: "1"
74+
metadata_expire: "86400"
75+
enabled_metadata: "1"
76+
varsFromContainerfile: Dockerfile
77+
- repoid: codeready-builder-for-rhel-9-aarch64-rpms
78+
name: Red Hat CodeReady Linux Builder for RHEL 9 aarch64 (RPMs)
79+
baseurl: https://cdn.redhat.com/content/dist/rhel9/{version}/aarch64/codeready-builder/os
80+
enabled: "1"
81+
gpgcheck: "1"
82+
gpgkey: file:///etc/pki/rpm-gpg/RPM-GPG-KEY-redhat-release
83+
sslverify: "1"
84+
sslcacert: /etc/rhsm/ca/redhat-uep.pem
85+
sslclientkey: /etc/pki/entitlement/placeholder-key.pem
86+
sslclientcert: /etc/pki/entitlement/placeholder.pem
87+
sslverifystatus: "1"
88+
metadata_expire: "86400"
89+
enabled_metadata: "1"
90+
varsFromContainerfile: Dockerfile
991
context:
1092
containerfile:
11-
file: ../Dockerfile
93+
file: Dockerfile
1294
stageName: build-image
1395
packages:
1496
- rust-toolset

0 commit comments

Comments
 (0)