Skip to content

Commit 224fc95

Browse files
committed
Post-review fixes
Added new tests to check sync groups are defined for all synced repos Updated sync group on various repos
1 parent 776eb95 commit 224fc95

File tree

4 files changed

+40
-5
lines changed

4 files changed

+40
-5
lines changed

.github/workflows/package-sync-nightly.yml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@ on:
66
- cron: '17 23 * * *'
77
env:
88
ANSIBLE_FORCE_COLOR: True
9-
ANSIBLE_VAULT_PASSWORD_FILE: ${{ github.workspace }}/vault-pass
109
jobs:
1110
sync-matrix-build:
1211
name: Build package matrix of package repo sync jobs

ansible/inventory/group_vars/all/package-repos

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -421,21 +421,21 @@ rpm_package_repos:
421421
url: https://mirror.rockylinux.org/mirrorlist?repo=rocky-AppStream-8.5&arch=x86_64&country=NL
422422
base_path: rocky/8.5/AppStream/x86_64/os/
423423
short_name: rocky_8_5_appstream
424-
sync_group: third_party
424+
sync_group: rocky_8
425425
distribution_name: rocky-8.5-appstream-
426426
sync: false
427427
- name: Rocky Linux 8.5 - BaseOS
428428
url: https://mirror.rockylinux.org/mirrorlist?repo=rocky-BaseOS-8.5&arch=x86_64&country=NL
429429
base_path: rocky/8.5/BaseOS/x86_64/os/
430430
short_name: rocky_8_5_baseos
431-
sync_group: third_party
431+
sync_group: rocky_8
432432
distribution_name: rocky-8.5-baseos-
433433
sync: false
434434
- name: Rocky Linux 8.5 - Extras
435435
url: https://mirror.rockylinux.org/mirrorlist?repo=rocky-extras-8.5&arch=x86_64&country=NL
436436
base_path: rocky/8.5/extras/x86_64/os/
437437
short_name: rocky_8_5_extras
438-
sync_group: third_party
438+
sync_group: rocky_8
439439
distribution_name: rocky-8.5-extras-
440440
sync: false
441441

@@ -833,7 +833,7 @@ rpm_package_repos:
833833
url: https://download.docker.com/linux/centos/9/x86_64/stable
834834
base_path: docker-ce/centos/9/x86_64/stable/
835835
short_name: centos_stream_9_docker
836-
sync_group: centos
836+
sync_group: docker
837837
distribution_name: docker-ce-for-centos-9-
838838
# Openstack Yoga for CentOS Stream 9
839839
- name: CentOS Stream 9 - OpenStack Yoga
@@ -861,6 +861,7 @@ rpm_package_repos:
861861
url: https://mirror.stream.centos.org/SIGs/9-stream/cloud/x86_64/openstack-caracal/
862862
base_path: centos/9-stream/cloud/x86_64/openstack-caracal/
863863
short_name: centos_stream_9_openstack_caracal
864+
sync_group: centos
864865
distribution_name: centos-stream-9-openstack-caracal-
865866

866867
# Additional RHEL 9 repositories
@@ -872,6 +873,7 @@ rpm_package_repos:
872873
sync_policy: mirror_content_only
873874
base_path: rabbitmq/erlang/el/9/x86_64/
874875
short_name: rhel9_rabbitmq_erlang
876+
sync_group: third_party
875877
distribution_name: rhel9-rabbitmq-erlang-
876878
# RabbitMQ for Redhat family, version 9
877879
- name: RabbitMQ - Server - RHEL 9
@@ -881,6 +883,7 @@ rpm_package_repos:
881883
sync_policy: mirror_content_only
882884
base_path: rabbitmq/rabbitmq-server/el/9/x86_64/
883885
short_name: rhel9_rabbitmq_server
886+
sync_group: third_party
884887
distribution_name: rhel9-rabbitmq-server-
885888
# TreasureData 4 for RHEL 9
886889
- name: TreasureData 4 - RHEL 9
@@ -908,6 +911,7 @@ rpm_package_repos:
908911
url: https://dlm.mariadb.com/repo/mariadb-server/10.11/yum/rhel/9/x86_64
909912
base_path: mariadb-10.11/yum/rhel/9/x86_64/
910913
short_name: rhel_9_mariadb_10_11
914+
sync_group: third_party
911915
distribution_name: mariadb-10.11-rhel-9-
912916
# InfluxDB for RHEL 9
913917
- name: InfluxDB - RHEL 9

ansible/validate-deb-repos.yml

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,11 @@
2828
that:
2929
- synced_deb_package_repos | rejectattr('url', 'defined') | list | length == 0
3030

31+
- name: Assert that synced Deb package repositories have sync groups
32+
assert:
33+
that:
34+
- synced_deb_package_repos | rejectattr('sync_group', 'defined') | list | length == 0
35+
3136
- name: Assert that published Deb package repositories have short names
3237
assert:
3338
that:
@@ -89,6 +94,10 @@
8994
package_sync_group: docker
9095
deb_package_repo_filter: jammy
9196

97+
- name: Assert that dev package repository list is defined
98+
assert:
99+
that:
100+
- dev_pulp_repository_deb_repos is defined
92101

93102
- name: Assert that dev package publication list is defined
94103
assert:

ansible/validate-rpm-repos.yml

Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,11 @@
2828
that:
2929
- synced_rpm_package_repos | rejectattr('url', 'defined') | list | length == 0
3030

31+
- name: Assert that synced RPM package repositories have sync groups
32+
assert:
33+
that:
34+
- synced_rpm_package_repos | rejectattr('sync_group', 'defined') | list | length == 0
35+
3136
- name: Assert that published RPM package repositories have short names
3237
assert:
3338
that:
@@ -72,6 +77,24 @@
7277
vars:
7378
rpm_package_repo_filter: docker centos_stream_8_baseos centos_stream_9_docker
7479

80+
- name: Assert that RPM package repository list can be filtered to one group
81+
assert:
82+
that:
83+
- rpm_package_repos_filtered | length == 2
84+
- rpm_package_repos_filtered[0].short_name == 'docker'
85+
- rpm_package_repos_filtered[1].short_name == 'centos_stream_9_docker'
86+
vars:
87+
package_sync_group: docker
88+
89+
- name: Assert that RPM package repository list can be filtered and use a sync group together
90+
assert:
91+
that:
92+
- rpm_package_repos_filtered | length == 1
93+
- rpm_package_repos_filtered[0].short_name == 'centos_stream_9_docker'
94+
vars:
95+
package_sync_group: docker
96+
rpm_package_repo_filter: stream_9
97+
7598
- name: Assert that dev package repository list is defined
7699
assert:
77100
that:

0 commit comments

Comments
 (0)