Skip to content
This repository has been archived by the owner on Aug 8, 2024. It is now read-only.

Commit

Permalink
Fix issues with restore test (azimuth-cloud#163)
Browse files Browse the repository at this point in the history
* 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
  • Loading branch information
mkjpryor authored Jul 15, 2024
1 parent 3ee7778 commit 66c0ec5
Show file tree
Hide file tree
Showing 4 changed files with 5 additions and 5 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ consul_server_replicas: 1
zenith_sshd_service_load_balancer_ip: "{{ lookup('env', 'ZENITH_SSHD_IP') }}"

# Configure Velero backups
velero_enabled: "{{ velero_aws_access_key_id | bool }}"
velero_enabled: "{{ not (not velero_aws_access_key_id) }}"
velero_s3_url: https://object.arcus.openstack.hpc.cam.ac.uk
velero_bucket_name: azimuth-ci-backups
velero_aws_access_key_id: "{{ lookup('env', 'VELERO_S3_ACCESS_KEY') }}"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ consul_server_replicas: 1
zenith_sshd_service_load_balancer_ip: "{{ lookup('env', 'ZENITH_SSHD_IP') }}"

# Configure Velero backups
velero_enabled: "{{ velero_aws_access_key_id | bool }}"
velero_enabled: "{{ not (not velero_aws_access_key_id) }}"
velero_s3_url: https://leafcloud.store
velero_bucket_name: azimuth-ci-backups
velero_aws_access_key_id: "{{ lookup('env', 'VELERO_S3_ACCESS_KEY') }}"
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/test-backup-restore.yml
Original file line number Diff line number Diff line change
Expand Up @@ -89,7 +89,7 @@ jobs:
source ./bin/activate "$AZIMUTH_CONFIG_ENVIRONMENT" "$AZIMUTH_ENVIRONMENT"
./bin/seed-ssh -- \
velero backup create $AZIMUTH_ENVIRONMENT \
--kubeconfig ./kubeconfig-azimuth-$AZIMUTH_ENVIRONMENT \
--kubeconfig ./kubeconfig-azimuth-$AZIMUTH_ENVIRONMENT.yaml \
--from-schedule default \
--wait
if: ${{ !cancelled() && steps.generate-tests.conclusion == 'success' }}
Expand Down Expand Up @@ -152,7 +152,7 @@ jobs:
source ./bin/activate "$AZIMUTH_CONFIG_ENVIRONMENT" "$AZIMUTH_ENVIRONMENT"
./bin/seed-ssh -- \
velero backup delete $AZIMUTH_ENVIRONMENT \
--kubeconfig ./kubeconfig-azimuth-$AZIMUTH_ENVIRONMENT \
--kubeconfig ./kubeconfig-azimuth-$AZIMUTH_ENVIRONMENT.yaml \
--confirm
if: ${{ always() }}

Expand Down
2 changes: 1 addition & 1 deletion requirements.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
collections:
- name: https://github.com/stackhpc/ansible-collection-azimuth-ops.git
type: git
version: 0.9.0
version: 0.9.1
# For local development
# - type: dir
# source: ../ansible-collection-azimuth-ops

0 comments on commit 66c0ec5

Please sign in to comment.