From 53a36dcaea873e76ef1a54de145cde1a0e44b3ea Mon Sep 17 00:00:00 2001 From: Heather Lanigan Date: Tue, 3 Dec 2024 19:27:26 +0000 Subject: [PATCH] test: fix jaas integration tests for microk8s The jaas integration tests were missing a change for how the microk8s.config is provided to the acceptance tests. Causing the add k8s cloud resource test to fail. --- .github/workflows/test_integration.yml | 1 + .github/workflows/test_integration_jaas.yaml | 8 ++++++-- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/.github/workflows/test_integration.yml b/.github/workflows/test_integration.yml index 317397b2..1a46380b 100644 --- a/.github/workflows/test_integration.yml +++ b/.github/workflows/test_integration.yml @@ -98,6 +98,7 @@ jobs: echo "TEST_MANAGEMENT_BR=10.150.40.0/24" >> $GITHUB_ENV echo "TEST_PUBLIC_BR=10.170.80.0/24" >> $GITHUB_ENV - name: "Set additional environment for LXD" + # setup the microk8s config to be used by the tests. if: ${{ matrix.action-operator.cloud == 'lxd' }} # language=bash run: | diff --git a/.github/workflows/test_integration_jaas.yaml b/.github/workflows/test_integration_jaas.yaml index 6209005c..ac98d90c 100644 --- a/.github/workflows/test_integration_jaas.yaml +++ b/.github/workflows/test_integration_jaas.yaml @@ -71,8 +71,6 @@ jobs: sudo microk8s.enable dns storage sudo microk8s.enable dns local-storage sudo -g snap_microk8s -E microk8s status --wait-ready --timeout=600 - echo "MICROK8S_CONFIG<> $GITHUB_ENV - sudo microk8s.config view >> $GITHUB_ENV echo "EOF" >> $GITHUB_ENV - name: Create additional networks when testing with LXD run: | @@ -93,6 +91,12 @@ jobs: echo "EOF" >> $GITHUB_ENV echo "TEST_MANAGEMENT_BR=10.150.40.0/24" >> $GITHUB_ENV echo "TEST_PUBLIC_BR=10.170.80.0/24" >> $GITHUB_ENV + - name: "Set additional environment for LXD" + # setup the microk8s config to be used by the tests. + if: ${{ matrix.action-operator.cloud == 'lxd' }} + # language=bash + run: | + sudo microk8s.config > /home/$USER/microk8s-config.yaml - run: go mod download - env: TF_ACC: "1"