From bab504654274ca8e3e43b8a13340952a7d5a9614 Mon Sep 17 00:00:00 2001 From: Tomas Hehejik Date: Fri, 25 Oct 2024 15:19:45 +0200 Subject: [PATCH] WIP do not set server-url by helper; use recent squid image Signed-off-by: Tomas Hehejik --- .github/workflows/main.yaml | 2 +- hosted/helpers/helper_common.go | 17 +++++++++-------- 2 files changed, 10 insertions(+), 9 deletions(-) diff --git a/.github/workflows/main.yaml b/.github/workflows/main.yaml index d0f1c63..2b4658e 100644 --- a/.github/workflows/main.yaml +++ b/.github/workflows/main.yaml @@ -148,7 +148,7 @@ jobs: - name: Install Proxy if: ${{ inputs.rancher_installed == 'hostname/password' && inputs.proxy == true }} run: | - docker run -d --name squid_proxy -v $(pwd)/.github/scripts/squid.conf:/etc/squid/squid.conf -p 3128:3128 wernight/squid + docker run -d --name squid_proxy -v $(pwd)/.github/scripts/squid.conf:/etc/squid/squid.conf -p 3128:3128 ubuntu/squid echo "PROXY_HOST=$(gcloud compute instances describe ${{ needs.create-runner.outputs.runner }} \ --format='get(networkInterfaces[0].networkIP)' --zone ${{ env.GCP_RUNNER_ZONE }}):3128" >> ${GITHUB_ENV} diff --git a/hosted/helpers/helper_common.go b/hosted/helpers/helper_common.go index 1e4d360..e9605a6 100644 --- a/hosted/helpers/helper_common.go +++ b/hosted/helpers/helper_common.go @@ -84,14 +84,15 @@ func CommonBeforeSuite() Context { rancherAdminClient, err := rancher.NewClient(rancherConfig.AdminToken, testSession) Expect(err).To(BeNil()) - setting := new(management.Setting) - resp, err := rancherAdminClient.Management.Setting.ByID("server-url") - Expect(err).To(BeNil()) - - setting.Source = "env" - setting.Value = fmt.Sprintf("https://%s", RancherHostname) - _, err = rancherAdminClient.Management.Setting.Update(resp, setting) - Expect(err).To(BeNil()) + // This is done by testhelpers already + //setting := new(management.Setting) + //resp, err := rancherAdminClient.Management.Setting.ByID("server-url") + //Expect(err).To(BeNil()) + + //setting.Source = "env" + //setting.Value = fmt.Sprintf("https://%s", RancherHostname) + //_, err = rancherAdminClient.Management.Setting.Update(resp, setting) + //Expect(err).To(BeNil()) cloudCredID, err := CreateCloudCredentials(rancherAdminClient) Expect(err).To(BeNil())