Skip to content

Commit f66506c

Browse files
Create DOCA builder env
1 parent 7b27767 commit f66506c

File tree

10 files changed

+64
-29
lines changed

10 files changed

+64
-29
lines changed

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

Lines changed: 11 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ on:
1919

2020
env:
2121
ANSIBLE_FORCE_COLOR: True
22-
KAYOBE_ENVIRONMENT: ci-builder
22+
KAYOBE_ENVIRONMENT: ci-doca-builder
2323
KAYOBE_VAULT_PASSWORD: ${{ secrets.KAYOBE_VAULT_PASSWORD }}
2424
jobs:
2525
overcloud-ofed-packages:
@@ -182,13 +182,13 @@ jobs:
182182
- name: Bootstrap the control host
183183
run: |
184184
source venvs/kayobe/bin/activate &&
185-
source src/kayobe-config/kayobe-env --environment ci-builder &&
185+
source src/kayobe-config/kayobe-env --environment ci-doca-builder &&
186186
kayobe control host bootstrap
187187
188188
- name: Run growroot playbook
189189
run: |
190190
source venvs/kayobe/bin/activate &&
191-
source src/kayobe-config/kayobe-env --environment ci-builder &&
191+
source src/kayobe-config/kayobe-env --environment ci-doca-builder &&
192192
kayobe playbook run src/kayobe-config/etc/kayobe/ansible/growroot.yml \
193193
-e seed_bootstrap_user="cloud-user" \
194194
-e controller_bootstrap_user="cloud-user" \
@@ -198,29 +198,24 @@ jobs:
198198
- name: Configure the seed host (Builder VM)
199199
run: |
200200
source venvs/kayobe/bin/activate &&
201-
source src/kayobe-config/kayobe-env --environment ci-builder &&
201+
source src/kayobe-config/kayobe-env --environment ci-doca-builder &&
202202
kayobe seed host configure \
203-
--skip-tags network,docker,docker-registry \
204-
-e seed_bootstrap_user="cloud-user" \
205-
-e controller_bootstrap_user="cloud-user" \
206-
-e dnf_install_doca=true \
207-
-e dnf_enable_doca_modules=false \
208-
-e stackhpc_repos_enabled=true
203+
--skip-tags network,docker,docker-registry
209204
env:
210205
KAYOBE_VAULT_PASSWORD: ${{ secrets.KAYOBE_VAULT_PASSWORD }}
211206

212207
- name: Run a distro-sync
213208
run: |
214209
source venvs/kayobe/bin/activate &&
215-
source src/kayobe-config/kayobe-env --environment ci-builder &&
210+
source src/kayobe-config/kayobe-env --environment ci-doca-builder &&
216211
kayobe seed host command run --become --command "dnf distro-sync --refresh --assumeyes"
217212
env:
218213
KAYOBE_VAULT_PASSWORD: ${{ secrets.KAYOBE_VAULT_PASSWORD }}
219214

220215
- name: Reset BLS entries on the seed host
221216
run: |
222217
source venvs/kayobe/bin/activate &&
223-
source src/kayobe-config/kayobe-env --environment ci-builder &&
218+
source src/kayobe-config/kayobe-env --environment ci-doca-builder &&
224219
kayobe playbook run src/kayobe-config/etc/kayobe/ansible/reset-bls-entries.yml \
225220
-e "reset_bls_host=ofed-builder"
226221
env:
@@ -229,31 +224,31 @@ jobs:
229224
- name: Disable noexec in /var/tmp
230225
run: |
231226
source venvs/kayobe/bin/activate &&
232-
source src/kayobe-config/kayobe-env --environment ci-builder &&
227+
source src/kayobe-config/kayobe-env --environment ci-doca-builder &&
233228
kayobe seed host command run --become --command "sed -i 's/noexec,//g' /etc/fstab"
234229
env:
235230
KAYOBE_VAULT_PASSWORD: ${{ secrets.KAYOBE_VAULT_PASSWORD }}
236231

237232
- name: Reboot to apply the kernel update
238233
run: |
239234
source venvs/kayobe/bin/activate &&
240-
source src/kayobe-config/kayobe-env --environment ci-builder &&
235+
source src/kayobe-config/kayobe-env --environment ci-doca-builder &&
241236
kayobe playbook run src/kayobe-config/etc/kayobe/ansible/reboot.yml
242237
env:
243238
KAYOBE_VAULT_PASSWORD: ${{ secrets.KAYOBE_VAULT_PASSWORD }}
244239

245240
- name: Run OFED builder playbook
246241
run: |
247242
source venvs/kayobe/bin/activate &&
248-
source src/kayobe-config/kayobe-env --environment ci-builder &&
243+
source src/kayobe-config/kayobe-env --environment ci-doca-builder &&
249244
kayobe playbook run src/kayobe-config/etc/kayobe/ansible/build-ofed-rocky.yml
250245
env:
251246
KAYOBE_VAULT_PASSWORD: ${{ secrets.KAYOBE_VAULT_PASSWORD }}
252247

253248
- name: Run OFED upload playbook
254249
run: |
255250
source venvs/kayobe/bin/activate &&
256-
source src/kayobe-config/kayobe-env --environment ci-builder &&
251+
source src/kayobe-config/kayobe-env --environment ci-doca-builder &&
257252
kayobe playbook run src/kayobe-config/etc/kayobe/ansible/push-ofed.yml \
258253
-e "ofed_tag=${{ steps.ofed_tag.outputs.ofed_tag }}"
259254
env:

etc/kayobe/environments/ci-builder/inventory/group_vars/ofed-builder/stackhpc-repos

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

etc/kayobe/environments/ci-builder/inventory/hosts

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,5 @@
11
# A 'seed' host used for building images.
22

3-
[ofed-builder:children]
4-
seed
5-
controllers
6-
73
# This is neccesary to run `overcloud deployment image build`
84
[controllers]
95
builder

etc/kayobe/environments/ci-builder/stackhpc-ci.yml

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -108,9 +108,3 @@ ipa_build_dib_env_extra:
108108
# builder being a member of the 'overcloud' group for IPA builds.
109109
stackhpc_repos_enabled: false
110110
enable_docker_repo: true
111-
112-
# Enable LVM for OFED builds
113-
seed_lvm_groups:
114-
- "{{ stackhpc_lvm_group_rootvg if dnf_install_doca | bool }}"
115-
controller_lvm_groups:
116-
- "{{ stackhpc_lvm_group_rootvg if dnf_install_doca | bool }}"
Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
---
2+
3+
dependencies:
4+
- ci-builder
Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
1+
---
2+
###############################################################################
3+
# Controller node configuration.
4+
5+
# User with which to access the controllers via SSH during bootstrap, in order
6+
# to setup the Kayobe user account. Default is {{ os_distribution }}.
7+
controller_bootstrap_user: cloud-user
8+
9+
###############################################################################
10+
# Controller node LVM configuration.
11+
12+
# List of controller volume groups. See mrlesmithjr.manage_lvm role for
13+
# format.
14+
controller_lvm_groups:
15+
- "{{ stackhpc_lvm_group_rootvg }}"
16+
17+
###############################################################################
18+
# Dummy variable to allow Ansible to accept this file.
19+
workaround_ansible_issue_8743: yes
File renamed without changes.
Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
[ofed-builder:children]
2+
seed
3+
controllers
Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
1+
---
2+
###############################################################################
3+
# Seed node configuration.
4+
5+
# User with which to access the seed via SSH during bootstrap, in order
6+
# to setup the Kayobe user account. Default is {{ os_distribution }}.
7+
seed_bootstrap_user: cloud-user
8+
9+
###############################################################################
10+
# Seed node LVM configuration.
11+
12+
# Seed lvm configuration. See inventory/group_vars/seed/lvm.yml
13+
# for the exact configuration.
14+
seed_lvm_groups:
15+
- "{{ stackhpc_lvm_group_rootvg }}"
16+
17+
###############################################################################
18+
# Dummy variable to allow Ansible to accept this file.
19+
workaround_ansible_issue_8743: yes
Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
---
2+
###############################################################################
3+
# StackHPC configuration.
4+
5+
# Enable StackHPC Ark repositories for DOCA builds
6+
stackhpc_repos_enabled: true
7+
dnf_install_doca: true
8+
dnf_enable_doca_modules: false

0 commit comments

Comments
 (0)