From 4ccff0139d77f2d8068ee4cb425ce6a99f06bc0d Mon Sep 17 00:00:00 2001 From: Guy Owen Date: Mon, 18 Nov 2024 11:22:37 +1100 Subject: [PATCH 1/2] Revert "Add workaround for az login issues (#326)" This reverts commit 8f5ae99568b51d256193e788c4b0f99dc542f4ad. --- images/awx-ee/execution-environment.yml | 3 --- 1 file changed, 3 deletions(-) diff --git a/images/awx-ee/execution-environment.yml b/images/awx-ee/execution-environment.yml index 4ed6095b..38541d61 100644 --- a/images/awx-ee/execution-environment.yml +++ b/images/awx-ee/execution-environment.yml @@ -95,6 +95,3 @@ additional_build_steps: && echo "deb [arch=$(dpkg --print-architecture) signed-by=/usr/share/keyrings/githubcli-archive-keyring.gpg] https://cli.github.com/packages stable main" | tee /etc/apt/sources.list.d/github-cli.list > /dev/null \ && apt update \ && DEBIAN_FRONTEND=noninteractive apt install gh -y - # @todo remove this once following issue resolved - # https://github.com/Azure/azure-cli/issues/30102#issuecomment-2427682019 - - RUN pip install --force-reinstall -v "azure-mgmt-rdbms==10.2.0b17" From b44bad51d558a477dc585c34eeedb0c96403a039 Mon Sep 17 00:00:00 2001 From: Guy Owen Date: Mon, 18 Nov 2024 13:01:31 +1100 Subject: [PATCH 2/2] [DDS-2083] Set lagoon_ansible_collection version. --- images/awx-ee/requirements.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/images/awx-ee/requirements.yml b/images/awx-ee/requirements.yml index 1ce65296..b69e6246 100644 --- a/images/awx-ee/requirements.yml +++ b/images/awx-ee/requirements.yml @@ -7,7 +7,7 @@ collections: - kubernetes.core - name: lagoon.api source: https://github.com/salsadigitalauorg/lagoon_ansible_collection.git - version: master + version: 1.5.0 type: git - name: section.api source: https://github.com/salsadigitalauorg/section_ansible_collection.git