Skip to content

Commit eac7396

Browse files
jackhodgkissjackhodgkiss
authored
Merge branch 'stackhpc/2024.1' into remove-tmout-for-dev-env
2 parents 7ac7099 + 4843b9b commit eac7396

File tree

11 files changed

+48
-16
lines changed

11 files changed

+48
-16
lines changed

‎.github/workflows/stackhpc-all-in-one.yml‎

Lines changed: 17 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -59,6 +59,18 @@ on:
5959
description: Whether to perform an upgrade
6060
type: boolean
6161
default: false
62+
stackhpc_cloud_tests_version:
63+
description: Git version of https://github.com/stackhpc/stackhpc-cloud-tests to use for testing
64+
type: string
65+
default: main
66+
repository:
67+
description: SKC repository to checkout (convenience for external CI)
68+
type: string
69+
default: ${{ github.repository }}
70+
github_ref:
71+
description: Git ref to checkout (convenience for external CI)
72+
type: string
73+
default: ${{ github.ref }}
6274
secrets:
6375
KAYOBE_VAULT_PASSWORD:
6476
required: true
@@ -94,7 +106,8 @@ jobs:
94106
- name: Checkout ${{ inputs.upgrade && 'previous release' || 'current' }} config
95107
uses: actions/checkout@v4
96108
with:
97-
ref: ${{ inputs.upgrade && env.PREVIOUS_BRANCH || github.ref }}
109+
repository: ${{ inputs.repository }}
110+
ref: ${{ inputs.upgrade && env.PREVIOUS_BRANCH || inputs.github_ref }}
98111
submodules: true
99112

100113
- name: Output Kayobe image
@@ -367,6 +380,8 @@ jobs:
367380
- name: Checkout current release config
368381
uses: actions/checkout@v4
369382
with:
383+
repository: ${{ inputs.repository }}
384+
ref: ${{ inputs.github_ref }}
370385
submodules: true
371386
clean: false
372387
if: inputs.upgrade
@@ -448,7 +463,7 @@ jobs:
448463
-v $(pwd)/sot-results:/stack/sot-results \
449464
-e KAYOBE_ENVIRONMENT -e KAYOBE_VAULT_PASSWORD -e KAYOBE_AUTOMATION_SSH_PRIVATE_KEY \
450465
$KAYOBE_IMAGE \
451-
/stack/kayobe-automation-env/src/kayobe-config/.automation/pipeline/playbook-run.sh '$KAYOBE_CONFIG_PATH/ansible/stackhpc-openstack-tests.yml'
466+
/stack/kayobe-automation-env/src/kayobe-config/.automation/pipeline/playbook-run.sh '$KAYOBE_CONFIG_PATH/ansible/stackhpc-openstack-tests.yml' -e sot_version=${{ inputs.stackhpc_cloud_tests_version }}
452467
env:
453468
KAYOBE_AUTOMATION_SSH_PRIVATE_KEY: ${{ steps.ssh_key.outputs.ssh_key }}
454469

‎doc/source/configuration/firewall.rst‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -86,7 +86,7 @@ Storage firewalld Configuration
8686
:caption: ``storage.yml``
8787
8888
###############################################################################
89-
# storage node firewalld configuration.
89+
# Storage node firewalld configuration.
9090
9191
# Whether to install and enable firewalld.
9292
storage_firewalld_enabled: true
@@ -118,7 +118,7 @@ Monitoring firewalld Configuration
118118
:caption: ``monitoring.yml``
119119
120120
###############################################################################
121-
# monitoring node firewalld configuration.
121+
# Monitoring node firewalld configuration.
122122
123123
# Whether to install and enable firewalld.
124124
monitoring_firewalld_enabled: true
@@ -182,7 +182,7 @@ Seed firewalld Configuration
182182
:caption: ``seed.yml``
183183
184184
###############################################################################
185-
# seed node firewalld configuration.
185+
# Seed node firewalld configuration.
186186
187187
# Whether to install and enable firewalld.
188188
seed_firewalld_enabled: true
@@ -211,7 +211,7 @@ Seed Hypervisor firewalld Configuration
211211
:caption: ``seed_hypervisor.yml``
212212
213213
###############################################################################
214-
# seed_hypervisor node firewalld configuration.
214+
# Seed hypervisor node firewalld configuration.
215215
216216
# Whether to install and enable firewalld.
217217
seed_hypervisor_firewalld_enabled: true

‎etc/kayobe/ansible/stackhpc-openstack-tests.yml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,8 @@
55
- stackhpc-openstack-tests
66
vars:
77
sot_venv: "{{ virtualenv_path }}/sot-venv"
8-
sot_repo: https://github.com/stackhpc/stackhpc-openstack-tests
9-
sot_version: v0.0.1
8+
sot_repo: https://github.com/stackhpc/stackhpc-cloud-tests
9+
sot_version: main
1010
sot_timeout: 30
1111
results_path_local: "{{ lookup('env', 'HOME') }}/sot-results"
1212
tasks:
@@ -66,7 +66,7 @@
6666
{{ sot_venv }}/bin/py.test
6767
--html={{ results_tmpdir.path }}/stackhpc-openstack-tests.html
6868
--self-contained-html
69-
--pyargs stackhpc_openstack_tests
69+
--pyargs stackhpc_cloud_tests
7070
--timeout {{ sot_timeout }}
7171
-vv
7272
environment:

‎etc/kayobe/environments/ci-multinode/monitoring.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
---
22
###############################################################################
3-
# monitoring node firewalld configuration.
3+
# Monitoring node firewalld configuration.
44

55
# Whether to install and enable firewalld.
66
monitoring_firewalld_enabled: true

‎etc/kayobe/environments/ci-multinode/seed-hypervisor.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
---
22
###############################################################################
3-
# seed_hypervisor node firewalld configuration.
3+
# Seed hypervisor node firewalld configuration.
44

55
# Whether to install and enable firewalld.
66
seed_hypervisor_firewalld_enabled: true

‎etc/kayobe/environments/ci-multinode/seed.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ snat_rules_manila:
2929
snat_rules: "{{ snat_rules_default + snat_rules_manila if (kolla_enable_manila | bool and kolla_enable_manila_backend_cephfs_native | bool) else snat_rules_default }}"
3030

3131
###############################################################################
32-
# seed node firewalld configuration.
32+
# Seed node firewalld configuration.
3333

3434
# Whether to install and enable firewalld.
3535
seed_firewalld_enabled: "{{ kolla_enable_ovn | bool }}"

‎etc/kayobe/environments/ci-multinode/storage.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ storage_lvm_groups:
66
- "{{ stackhpc_lvm_group_rootvg }}"
77

88
###############################################################################
9-
# storage node firewalld configuration.
9+
# Storage node firewalld configuration.
1010

1111
# Whether to install and enable firewalld.
1212
storage_firewalld_enabled: true

‎etc/kayobe/ipa.yml‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -107,6 +107,13 @@ ipa_ramdisk_upstream_url: "{{ (stackhpc_ipa_image_url + '/ipa.initramfs') if sta
107107
# Algorithm of checksum of Ironic deployment ramdisk image.
108108
#ipa_ramdisk_checksum_algorithm:
109109

110+
# IPA download parameters
111+
image_download_url_username: "{{ stackhpc_release_pulp_username }}"
112+
image_download_url_password: "{{ stackhpc_release_pulp_password }}"
113+
image_download_force_basic_auth: true
114+
image_download_unredirected_headers:
115+
- Authorization
116+
110117
###############################################################################
111118
# Ironic Python Agent (IPA) deployment configuration.
112119

‎etc/kayobe/pulp-host-image-versions.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
---
22
# Overcloud host image versioning tags
33
# These images must be in SMS, since they are used by our AIO CI runners
4-
stackhpc_rocky_9_overcloud_host_image_version: "2024.1-20240912T145502"
5-
stackhpc_ubuntu_jammy_overcloud_host_image_version: "2024.1-20240911T124950"
4+
stackhpc_rocky_9_overcloud_host_image_version: "2024.1-20241209T151515"
5+
stackhpc_ubuntu_jammy_overcloud_host_image_version: "2024.1-20250116T133659"

‎etc/kayobe/stackhpc-overcloud-dib.yml‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,9 @@ stackhpc_overcloud_dib_elements:
3737
stackhpc_overcloud_dib_env_vars:
3838
DIB_BLOCK_DEVICE_CONFIG: "{{ stackhpc_overcloud_dib_block_device_config_uefi_lvm }}"
3939
DIB_BOOTLOADER_DEFAULT_CMDLINE: "nofb nomodeset gfxpayload=text net.ifnames=1 rd.auto"
40-
DIB_CLOUD_INIT_DATASOURCES: "ConfigDrive"
40+
DIB_GRUB_TIMEOUT: "5"
41+
DIB_GRUB_TIMEOUT_STYLE: "menu"
42+
DIB_CLOUD_INIT_DATASOURCES: "OpenStack, ConfigDrive"
4143
DIB_CONTAINERFILE_RUNTIME: "docker"
4244
DIB_CONTAINERFILE_NETWORK_DRIVER: "host"
4345
DIB_CONTAINERFILE_DOCKERFILE: "/opt/kayobe/src/stackhpc-image-elements/elements/rocky-container-stackhpc/containerfiles/9-stackhpc"

0 commit comments

Comments
 (0)