Skip to content

Commit 0699057

Browse files
authored
Merge pull request #672 from stackhpc/2023.1-zed-merge
antelope: zed merge
2 parents e6a2b5b + 2e4f29a commit 0699057

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

43 files changed

+352
-170
lines changed

.automation.conf/config.sh

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,8 +24,9 @@ if [ ! -z ${KAYOBE_ENVIRONMENT:+x} ]; then
2424
# SMSLab is currently running with 1G switches. This causes tests using volumes and images to fail if
2525
# the concurrency is set too high.
2626
export TEMPEST_CONCURRENCY=1
27-
export KAYOBE_AUTOMATION_TEMPEST_LOADLIST=tempest-full
28-
export KAYOBE_AUTOMATION_TEMPEST_SKIPLIST=ci-multinode
27+
# Uncomment this to perform a full tempest test
28+
# export KAYOBE_AUTOMATION_TEMPEST_LOADLIST=tempest-full
29+
# export KAYOBE_AUTOMATION_TEMPEST_SKIPLIST=ci-multinode-tempest-full
2930
fi
3031

3132
fi
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
refstack-2019.11-test-list.txt
1+
platform.2022.11-test-list.txt

.automation.conf/tempest/load-lists/refstack-2019.11-test-list.txt renamed to .automation.conf/tempest/load-lists/platform.2022.11-test-list.txt

Lines changed: 60 additions & 18 deletions
Large diffs are not rendered by default.

.automation.conf/tempest/tempest-ci-multinode.overrides.conf

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ v3_endpoint_type = publicURL
1010
[compute]
1111
min_compute_nodes = 2
1212
min_microversion = 2.1
13-
max_microversion = 2.88
13+
max_microversion = 2.93
1414

1515
[service-clients]
1616
http_timeout = 600
@@ -26,7 +26,7 @@ console_output = true
2626
storage_protocol = ceph
2727
build_timeout = 600
2828
min_microversion = 3.0
29-
max_microversion = 3.66
29+
max_microversion = 3.70
3030

3131
[image]
3232
build_timeout = 600

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -254,7 +254,7 @@ jobs:
254254
-v $(pwd)/tempest-artifacts:/stack/tempest-artifacts \
255255
-e KAYOBE_ENVIRONMENT -e KAYOBE_VAULT_PASSWORD -e KAYOBE_AUTOMATION_SSH_PRIVATE_KEY \
256256
$KAYOBE_IMAGE \
257-
/stack/kayobe-automation-env/src/kayobe-config/.automation/pipeline/tempest.sh -e ansible_user=stack
257+
/stack/kayobe-automation-env/src/kayobe-config/.automation/pipeline/tempest.sh -e ansible_user=stack -e rally_no_sensitive_log=false
258258
env:
259259
KAYOBE_AUTOMATION_SSH_PRIVATE_KEY: ${{ steps.ssh_key.outputs.ssh_key }}
260260

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

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -211,7 +211,8 @@ jobs:
211211
container-sync.yml \
212212
--repo stackhpc/stackhpc-release-train \
213213
--ref main \
214-
-f filter="$filter"
214+
-f filter="$filter" \
215+
-f sync-old-images=false
215216
env:
216217
GITHUB_TOKEN: ${{ secrets.STACKHPC_RELEASE_TRAIN_TOKEN }}
217218

doc/source/configuration/swap.rst

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,11 @@
22
Swap
33
====
44

5+
Support for :kayobe-doc:`managing swap files and devices
6+
<configuration/reference/hosts.html#swap>` was added to Kayobe in the Zed
7+
release. The custom playbook described below is retained for backwards
8+
compatibility but may be removed in a future release.
9+
510
StackHPC Kayobe configuration provides a ``swap.yml`` custom playbook that may
611
be used to configure a swap device.
712

etc/kayobe/ansible/filter_plugins

Lines changed: 0 additions & 1 deletion
This file was deleted.

0 commit comments

Comments
 (0)