Skip to content

Commit 922d30d

Browse files
committed
Fix apt config path
1 parent bf2af32 commit 922d30d

File tree

2 files changed

+1
-9
lines changed

2 files changed

+1
-9
lines changed

.github/workflows/stackhpc-container-image-build.yml

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -203,14 +203,6 @@ jobs:
203203
- name: Create build logs output directory
204204
run: mkdir image-build-logs
205205

206-
- name: Write apt config to file
207-
run: |
208-
cat > stackhpc-apt-preferences <<EOF
209-
Package: openvswitch-switch openvswitch-common openvswitch-common-dpdk python3-openvswitch
210-
Pin: version 3.3.*
211-
Pin-Priority: 1001
212-
EOF
213-
214206
- name: Build kolla overcloud images
215207
id: build_overcloud_images
216208
continue-on-error: true

etc/kayobe/kolla/kolla-build.conf

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
{# This tag should be updated when Ubuntu package repo snapshot versions are changed. #}
55
{% if kolla_base_distro == 'ubuntu' %}
66
base_tag = noble-20241118.1
7-
apt_preferences = /home/runner/_work/stackhpc-kayobe-config/stackhpc-kayobe-config/etc/kayobe/environments/ci-builder/builder-apt-preferences
7+
apt_preferences = /home/runner/_work/stackhpc-kayobe-config/stackhpc-kayobe-config/src/kayobe-config/etc/kayobe/environments/ci-builder/builder-apt-preferences
88
{# Similarly pinning to Rocky 9 minor version used in our repos #}
99
{% elif kolla_base_distro == 'rocky' %}
1010
base_tag = 9.{{ stackhpc_pulp_repo_rocky_9_minor_version }}

0 commit comments

Comments
 (0)