Skip to content

Commit bc36b78

Browse files
committed
testing enabling release train for 8.10
1 parent 2357a73 commit bc36b78

File tree

5 files changed

+25
-8
lines changed

5 files changed

+25
-8
lines changed

.github/workflows/nightlybuild.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ jobs:
2525
matrix: # build RL8, RL9
2626
build:
2727
- image_name: rocky-latest-RL8
28-
source_image_name: Rocky-8-GenericCloud-Base-8.9-20231119.0.x86_64.qcow2
28+
source_image_name: Rocky-8-GenericCloud-Base-8.10-20240528.0.x86_64.qcow2
2929
inventory_groups: update
3030
- image_name: rocky-latest-RL9
3131
source_image_name: Rocky-9-GenericCloud-Base-9.4-20240523.0.x86_64.qcow2

ansible/bootstrap.yml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -122,7 +122,6 @@
122122
ansible.builtin.include_role:
123123
name: dnf_repos
124124
tasks_from: set_repos.yml
125-
when: ansible_distribution_major_version == "9" #TODO update role once RL8 config decided
126125

127126
# --- tasks after here require access to package repos ---
128127
- hosts: squid

ansible/disable-repos.yml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,4 +5,3 @@
55
ansible.builtin.include_role:
66
name: dnf_repos
77
tasks_from: disable_repos.yml
8-
when: ansible_distribution_major_version == "9" #TODO update role once RL8 config decided

ansible/roles/dnf_repos/defaults/main.yml

Lines changed: 19 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -4,18 +4,32 @@ dnf_repos_epel_prefix: "epel/{{ ansible_distribution_major_version }}"
44
dnf_repos_username: "{{ omit }}"
55
dnf_repos_password: "{{ omit }}"
66

7+
dnf_repos_filenames:
8+
'8':
9+
baseos: 'Rocky-BaseOS'
10+
appstream: 'Rocky-AppStream'
11+
crb: 'Rocky-PowerTools'
12+
extras: 'Rocky-Extras'
13+
'9':
14+
baseos: 'rocky'
15+
appstream: 'rocky'
16+
crb: 'rocky'
17+
extras: 'rocky-extras'
18+
19+
dnf_repos_version_filenames: "{{ dnf_repos_filenames[ansible_distribution_major_version] }}"
20+
721
# epel installed separately
822
dnf_repos_repolist:
9-
- file: rocky
23+
- file: "{{ dnf_repos_version_filenames.baseos }}"
1024
name: baseos
1125
base_url: "{{ dnf_repos_pulp_content_url }}/{{ dnf_repos_rocky_prefix }}/BaseOS/{{ ansible_architecture }}/os/{{ appliances_repo_timestamps.baseos[ansible_distribution_version] }}"
12-
- file: rocky
26+
- file: "{{ dnf_repos_version_filenames.appstream }}"
1327
name: appstream
1428
base_url: "{{ dnf_repos_pulp_content_url }}/{{ dnf_repos_rocky_prefix }}/AppStream/{{ ansible_architecture }}/os/{{ appliances_repo_timestamps.appstream[ansible_distribution_version] }}"
15-
- file: rocky
16-
name: crb
29+
- file: "{{ dnf_repos_version_filenames.crb }}"
30+
name: "{{ 'powertools' if ansible_distribution_major_version == '8' else 'crb' }}"
1731
base_url: "{{ dnf_repos_pulp_content_url }}/{{ dnf_repos_rocky_prefix }}/CRB/{{ ansible_architecture }}/os/{{ appliances_repo_timestamps.crb[ansible_distribution_version] }}"
18-
- file: rocky-extras
32+
- file: "{{ dnf_repos_version_filenames.extras }}"
1933
name: extras
2034
base_url: "{{ dnf_repos_pulp_content_url }}/{{ dnf_repos_rocky_prefix }}/extras/{{ ansible_architecture }}/os/{{ appliances_repo_timestamps.extras[ansible_distribution_version] }}"
2135

environments/common/inventory/group_vars/all/defaults.yml

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -85,11 +85,16 @@ appliances_local_users: "{{ appliances_local_users_default + appliances_local_us
8585
appliances_repo_timestamps:
8686
baseos:
8787
'9.4': 20240816T002610
88+
'8.10': 20241217T123729
8889
appstream:
8990
'9.4': 20240816T002610
91+
'8.10': 20241217T123729
9092
crb:
9193
'9.4': 20240816T002610
94+
'8.10': 20241217T123729
9295
extras:
9396
'9.4': 20240816T002610
97+
'8.10': 20241217T123729
9498
epel:
9599
'9': 20240902T080424
100+
'8': 20241216T235733

0 commit comments

Comments
 (0)