Skip to content

Commit 3abbe40

Browse files
Add Pulp workflow support
1 parent d49212c commit 3abbe40

File tree

4 files changed

+27
-4
lines changed

4 files changed

+27
-4
lines changed

.github/workflows/package-build-ofed.yml

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,6 +48,11 @@ jobs:
4848
BRANCH=$(awk -F'=' '/defaultbranch/ {print $2}' src/kayobe-config/.gitreview)
4949
echo "openstack_release=${BRANCH}" | sed -E "s,(stable|unmaintained)/,," >> $GITHUB_OUTPUT
5050
51+
- name: Generate OFED tag
52+
id: ofed_tag
53+
run: |
54+
echo "ofed_tag=$(date +%Y%m%dT%H%M%S)" >> $GITHUB_OUTPUT
55+
5156
- name: Clone StackHPC Kayobe repository
5257
uses: actions/checkout@v4
5358
with:
@@ -242,7 +247,8 @@ jobs:
242247
run: |
243248
source venvs/kayobe/bin/activate &&
244249
source src/kayobe-config/kayobe-env --environment ci-builder &&
245-
kayobe playbook run src/kayobe-config/etc/kayobe/ansible/push-ofed.yml
250+
kayobe playbook run src/kayobe-config/etc/kayobe/ansible/push-ofed.yml \
251+
-e "ofed_tag=${{ steps.ofed_tag.outputs.ofed_tag }}"
246252
env:
247253
KAYOBE_VAULT_PASSWORD: ${{ secrets.KAYOBE_VAULT_PASSWORD }}
248254

etc/kayobe/ansible/push-ofed.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -55,8 +55,8 @@
5555
pulp_url: "{{ stackhpc_release_pulp_url }}"
5656
username: "{{ stackhpc_release_pulp_username }}"
5757
password: "{{ stackhpc_release_pulp_password }}"
58-
name: "{{ stackhpc_pulp_repo_doca_ofed_rhel9.distribution_name }}-{{ stackhpc_doca_ofed_repo_version }}"
58+
name: "{{ stackhpc_pulp_repo_doca_ofed_rhel9.distribution_name }}-{{ ofed_tag }}"
5959
publication: "{{ publication.publication.pulp_href }}"
60-
base_path: "{{ stackhpc_pulp_repo_doca_ofed_rhel9.base_path }}/{{ stackhpc_doca_ofed_repo_version }}"
61-
content_guard: "development"
60+
content_guard: development
61+
base_path: "{{ stackhpc_pulp_repo_doca_ofed_rhel9.base_path }/{{ ofed_tag }}"
6262
state: present

etc/kayobe/dnf.yml

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -49,6 +49,17 @@ dnf_custom_repos: "{{ stackhpc_dnf_repos if stackhpc_repos_enabled | bool else [
4949
# file.
5050
stackhpc_dnf_repos: "{{ dnf_custom_repos_el9 | combine(dnf_custom_repos_rocky_9) | combine(dnf_custom_repos_elrepo_9 if dnf_install_elrepo_9 | bool else {}) }}"
5151

52+
# OFED repository for Rocky 9
53+
dnf_custom_repos_ofed:
54+
ofed:
55+
baseurl: "{{ stackhpc_repo_rocky_ofed_url }}"
56+
description: "Mellanox Technologies doca_ofed {{ stackhpc_pulp_doca_ofed_version }} Rocky 9.{{ stackhpc_pulp_repo_rocky_9_minor_version }}"
57+
enabled: "{{ dnf_enable_rocky_ofed | bool }}"
58+
file: ofed
59+
gpgcheck: no
60+
username: "{{ stackhpc_repo_mirror_username | default(omit, true) }}"
61+
password: "{{ stackhpc_repo_mirror_password | default(omit, true) }}"
62+
5263
# Custom repositories shared between all RHEL 9 derivatives.
5364
dnf_custom_repos_el9:
5465
epel:
@@ -152,6 +163,8 @@ dnf_enable_docker: true
152163
#URL of docker repo GPG key
153164
dnf_docker_gpg_key_url: "https://download.docker.com/linux/centos/gpg"
154165

166+
# Whether to enable OFED repositories
167+
dnf_enable_rocky_ofed: false
155168

156169
###############################################################################
157170
# DNF Automatic configuration.

etc/kayobe/stackhpc.yml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -52,6 +52,10 @@ stackhpc_repo_docker_ce_ubuntu_jammy_version: "{{ stackhpc_repo_distribution }}"
5252
###############################################################################
5353
# RPMs
5454

55+
# OFED
56+
stackhpc_repo_ofed_url: "{{ stackhpc_repo_mirror_url }}/pulp/content/doca_ofed/{ stackhpc_pulp_doca_ofed_version }}/rhel9.{{ stackhpc_pulp_repo_rocky_9_minor_version }}/x86_64/{{ stackhpc_repo_rocky_9_doca_ofed_version }}"
57+
stackhpc_repo_rocky_9_doca_ofed_version: "{{ stackhpc_repo_distribution }}"
58+
5559
# Grafana
5660
stackhpc_repo_grafana_url: "{{ stackhpc_repo_mirror_url }}/pulp/content/grafana/oss/rpm/{{ stackhpc_repo_grafana_version }}"
5761
stackhpc_repo_grafana_version: "{{ stackhpc_repo_distribution }}"

0 commit comments

Comments
 (0)