Skip to content

Commit 9723782

Browse files
committed
testing builds with leafcloud pulp
1 parent 2230bb8 commit 9723782

File tree

3 files changed

+36
-17
lines changed

3 files changed

+36
-17
lines changed
Lines changed: 35 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,25 +1,47 @@
1-
dnf_repos_rocky_ark_prefix: https://ark.stackhpc.com/pulp/content/{{ ansible_distribution | lower }}/{{ ansible_distribution_version }}
2-
dnf_repos_rocky_ark_suffix: "{{ ansible_architecture }}/os/{{ dnf_repos_rocky_ark_timestamp }}/"
3-
# most stable from https://github.com/stackhpc/stackhpc-kayobe-config/blob/stackhpc/2024.1/etc/kayobe/pulp-repo-versions.yml
4-
# note that some timestamps can't be used because not all repos have snapshots for them
5-
dnf_repos_rocky_ark_timestamp: 20240816T002610
6-
dnf_repos_username: slurm-app-ci
7-
dnf_repos_password: "{{ lookup('ansible.builtin.env', 'ARK_PASSWORD') }}"
1+
# dnf_repos_rocky_ark_prefix: https://ark.stackhpc.com/pulp/content/{{ ansible_distribution | lower }}/{{ ansible_distribution_version }}
2+
# dnf_repos_rocky_ark_suffix: "{{ ansible_architecture }}/os/{{ dnf_repos_rocky_ark_timestamp }}/"
3+
# # most stable from https://github.com/stackhpc/stackhpc-kayobe-config/blob/stackhpc/2024.1/etc/kayobe/pulp-repo-versions.yml
4+
# # note that some timestamps can't be used because not all repos have snapshots for them
5+
# dnf_repos_rocky_ark_timestamp: 20240816T002610
6+
# dnf_repos_username: slurm-app-ci
7+
# dnf_repos_password: "{{ lookup('ansible.builtin.env', 'ARK_PASSWORD') }}"
8+
9+
# # epel installed separately
10+
# dnf_repos_repolist:
11+
# - file: rocky
12+
# name: baseos
13+
# base_url: "{{ dnf_repos_rocky_ark_prefix }}/BaseOS/{{ dnf_repos_rocky_ark_suffix }}"
14+
# - file: rocky
15+
# name: appstream
16+
# base_url: "{{ dnf_repos_rocky_ark_prefix }}/AppStream/{{ dnf_repos_rocky_ark_suffix }}"
17+
# - file: rocky
18+
# name: crb
19+
# base_url: "{{ dnf_repos_rocky_ark_prefix }}/CRB/{{ dnf_repos_rocky_ark_suffix }}"
20+
# - file: rocky-extras
21+
# name: extras
22+
# base_url: "{{ dnf_repos_rocky_ark_prefix }}/extras/{{ dnf_repos_rocky_ark_suffix }}"
23+
24+
# dnf_repos_epel_timestamp: 20240902T080424
25+
# dnf_repos_epel_baseurl: "https://ark.stackhpc.com/pulp/content/epel/{{ ansible_distribution_major_version }}/Everything/{{ ansible_architecture }}/{{ dnf_repos_epel_timestamp }}"
26+
27+
dnf_repos_pulp_url: # required
28+
dnf_repos_pulp_content_url: "{{ dnf_repos_pulp_url }}/pulp/content"
29+
dnf_repos_rocky_prefix: "{{ ansible_distribution | lower }}/{{ ansible_distribution_version }}"
30+
dnf_repos_epel_prefix: "epel/{{ ansible_distribution_major_version }}"
831

932
# epel installed separately
1033
dnf_repos_repolist:
1134
- file: rocky
1235
name: baseos
13-
base_url: "{{ dnf_repos_rocky_ark_prefix }}/BaseOS/{{ dnf_repos_rocky_ark_suffix }}"
36+
base_url: "{{ dnf_repos_pulp_content_url }}/{{ dnf_repos_rocky_prefix }}/baseos"
1437
- file: rocky
1538
name: appstream
16-
base_url: "{{ dnf_repos_rocky_ark_prefix }}/AppStream/{{ dnf_repos_rocky_ark_suffix }}"
39+
base_url: "{{ dnf_repos_pulp_content_url }}/{{ dnf_repos_rocky_prefix }}/appstream"
1740
- file: rocky
1841
name: crb
19-
base_url: "{{ dnf_repos_rocky_ark_prefix }}/CRB/{{ dnf_repos_rocky_ark_suffix }}"
42+
base_url: "{{ dnf_repos_pulp_content_url }}/{{ dnf_repos_rocky_prefix }}/crb"
2043
- file: rocky-extras
2144
name: extras
22-
base_url: "{{ dnf_repos_rocky_ark_prefix }}/extras/{{ dnf_repos_rocky_ark_suffix }}"
45+
base_url: "{{ dnf_repos_pulp_content_url }}/{{ dnf_repos_rocky_prefix }}/extras"
2346

24-
dnf_repos_epel_timestamp: 20240902T080424
25-
dnf_repos_epel_baseurl: "https://ark.stackhpc.com/pulp/content/epel/{{ ansible_distribution_major_version }}/Everything/{{ ansible_architecture }}/{{ dnf_repos_epel_timestamp }}"
47+
dnf_repos_epel_baseurl: "{{ dnf_repos_pulp_content_url }}/epel/{{ ansible_distribution_major_version }}"

ansible/roles/dnf_repos/tasks/set_repos.yml

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,6 @@
66
name: "{{ item.name }}"
77
baseurl: "{{ item.base_url }}"
88
description: "{{ item.name }}"
9-
username: "{{ dnf_repos_username }}"
10-
password: "{{ dnf_repos_password }}"
119
loop: "{{ dnf_repos_repolist }}"
1210

1311
- name: Install epel-release
@@ -21,6 +19,4 @@
2119
file: epel
2220
description: epel
2321
gpgcheck: false
24-
username: "{{ dnf_repos_username }}"
25-
password: "{{ dnf_repos_password }}"
2622
baseurl: "{{ dnf_repos_epel_baseurl }}"
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1 +1,2 @@
11
#update_enable: false # Can uncomment for speed debugging non-update related build issues
2+
dnf_repos_pulp_url: http://192.168.10.157:8080

0 commit comments

Comments
 (0)