WIP do not set server-url by helper; use recent squid image

Signed-off-by: Tomas Hehejik <[email protected]>
rancher · Oct 25, 2024 · bab5046 · bab5046
1 parent 9ae410b
commit bab5046
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 9 deletions.
diff --git 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
@@ -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())