Skip to content

Commit 66c0ec5

Browse files
author
Matt Pryor
authored
Fix issues with restore test (azimuth-cloud#163)
* Add debug statements * Try alternative boolean conversion * Revert requirements change * [skip ci] Fix issue with bool filter in restore test * Update azimuth-ops to branch with fix * Fix typo in kubeconfig path * azimuth-ops changed merged and tagged
1 parent 3ee7778 commit 66c0ec5

File tree

4 files changed

+5
-5
lines changed

4 files changed

+5
-5
lines changed

.github/environments/arcus-ha/inventory/group_vars/all/variables.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ consul_server_replicas: 1
2828
zenith_sshd_service_load_balancer_ip: "{{ lookup('env', 'ZENITH_SSHD_IP') }}"
2929

3030
# Configure Velero backups
31-
velero_enabled: "{{ velero_aws_access_key_id | bool }}"
31+
velero_enabled: "{{ not (not velero_aws_access_key_id) }}"
3232
velero_s3_url: https://object.arcus.openstack.hpc.cam.ac.uk
3333
velero_bucket_name: azimuth-ci-backups
3434
velero_aws_access_key_id: "{{ lookup('env', 'VELERO_S3_ACCESS_KEY') }}"

.github/environments/leafcloud-ha/inventory/group_vars/all/variables.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ consul_server_replicas: 1
3939
zenith_sshd_service_load_balancer_ip: "{{ lookup('env', 'ZENITH_SSHD_IP') }}"
4040

4141
# Configure Velero backups
42-
velero_enabled: "{{ velero_aws_access_key_id | bool }}"
42+
velero_enabled: "{{ not (not velero_aws_access_key_id) }}"
4343
velero_s3_url: https://leafcloud.store
4444
velero_bucket_name: azimuth-ci-backups
4545
velero_aws_access_key_id: "{{ lookup('env', 'VELERO_S3_ACCESS_KEY') }}"

.github/workflows/test-backup-restore.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -89,7 +89,7 @@ jobs:
8989
source ./bin/activate "$AZIMUTH_CONFIG_ENVIRONMENT" "$AZIMUTH_ENVIRONMENT"
9090
./bin/seed-ssh -- \
9191
velero backup create $AZIMUTH_ENVIRONMENT \
92-
--kubeconfig ./kubeconfig-azimuth-$AZIMUTH_ENVIRONMENT \
92+
--kubeconfig ./kubeconfig-azimuth-$AZIMUTH_ENVIRONMENT.yaml \
9393
--from-schedule default \
9494
--wait
9595
if: ${{ !cancelled() && steps.generate-tests.conclusion == 'success' }}
@@ -152,7 +152,7 @@ jobs:
152152
source ./bin/activate "$AZIMUTH_CONFIG_ENVIRONMENT" "$AZIMUTH_ENVIRONMENT"
153153
./bin/seed-ssh -- \
154154
velero backup delete $AZIMUTH_ENVIRONMENT \
155-
--kubeconfig ./kubeconfig-azimuth-$AZIMUTH_ENVIRONMENT \
155+
--kubeconfig ./kubeconfig-azimuth-$AZIMUTH_ENVIRONMENT.yaml \
156156
--confirm
157157
if: ${{ always() }}
158158

requirements.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
collections:
44
- name: https://github.com/stackhpc/ansible-collection-azimuth-ops.git
55
type: git
6-
version: 0.9.0
6+
version: 0.9.1
77
# For local development
88
# - type: dir
99
# source: ../ansible-collection-azimuth-ops

0 commit comments

Comments
 (0)