go.mod and go.sum changes

anupama2501 · Dec 23, 2024 · 29d1ac3 · 29d1ac3
1 parent 02f28c1
commit 29d1ac3
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 7 deletions.
diff --git a/go.mod b/go.mod
@@ -14,7 +14,6 @@ replace (
 
 	github.com/rancher/rancher/pkg/apis => ./pkg/apis
 	github.com/rancher/rancher/pkg/client => ./pkg/client
-	github.com/rancher/shepherd => github.com/caliskanugur/shepherd v0.0.0-20241125152512-d782dea6d0e3
 
 	go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc => go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.53.0
 	go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp => go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.53.0

diff --git a/go.sum b/go.sum
@@ -206,8 +206,6 @@ github.com/bugsnag/osext v0.0.0-20130617224835-0dd3f918b21b/go.mod h1:obH5gd0Bsq
 github.com/bugsnag/panicwrap v0.0.0-20160118154447-aceac81c6e2f h1:7+HZb3PwI0cCUETyMDgPCvSta1y3idwBL8PHwSgelJk=
 github.com/bugsnag/panicwrap v0.0.0-20160118154447-aceac81c6e2f/go.mod h1:D/8v3kj0zr8ZAKg1AQ6crr+5VwKN5eIywRkfhyM/+dE=
 github.com/bwesterb/go-ristretto v1.2.3/go.mod h1:fUIoIZaG73pV5biE2Blr2xEzDoMj7NFEuV9ekS419A0=
-github.com/caliskanugur/shepherd v0.0.0-20241125152512-d782dea6d0e3 h1:6lyQ5yF4EKKXe5b3tzslzwNqrPiml7fG8LzN9uxgWeM=
-github.com/caliskanugur/shepherd v0.0.0-20241125152512-d782dea6d0e3/go.mod h1:TD6hF654momYGPQ0plWbigLSF1My6KhaxcTjWoJF/nU=
 github.com/cenkalti/backoff/v4 v4.3.0 h1:MyRJ/UdXutAwSAT+s3wNd7MfTIcy71VQueUuFK343L8=
 github.com/cenkalti/backoff/v4 v4.3.0/go.mod h1:Y3VNntkOUPxTVeUxJ/G5vcM//AlwfmyYozVcomhLiZE=
 github.com/census-instrumentation/opencensus-proto v0.2.1/go.mod h1:f6KPmirojxKA12rnyqOA5BBL4O983OfeGPqjHWSTneU=

diff --git a/tests/v2/validation/pipeline/Jenkinsfile.release.upgrade.local b/tests/v2/validation/pipeline/Jenkinsfile.release.upgrade.local
@@ -64,6 +64,9 @@ node {
       timeout = "${env.TIMEOUT}" 
     }
 
+    def date = sh(script: "date +%Y-%m-%d", returnStdout: true).trim()
+    env.TEST_RUN_NAME = env.TEST_RUN_NAME + date
+
     def cleanup = env.RANCHER_CLEANUP.toLowerCase()
 
     def localConfigFileName = ""
@@ -486,7 +489,7 @@ node {
                   try{
                     sh 'echo Cleanup is enabled'
 
-                    sh "docker run --volumes-from ${buildTestContainer} --name ${cleanupTestContainer} -t --env-file ${envFile} " +
+                    sh "docker run --volumes-from ${buildTestContainer} --name ${cleanupContainer} -t --env-file ${envFile} " +
                       "${golangImageName} sh -c \"${workPath}pipeline/scripts/rancher_cleanup.sh\""
 
                     sh "docker stop ${cleanupContainer}"
@@ -506,8 +509,8 @@ node {
                 sh "docker rm -v ${configGeneratorContainer}"
 
                 if (cleanup.toBoolean()) {
-                  sh "docker stop ${cleanupTestContainer}"
-                  sh "docker rm -v ${cleanupTestContainer}"
+                  sh "docker stop ${cleanupContainer}"
+                  sh "docker rm -v ${cleanupContainer}"
                 }
 
                 sh "docker rmi -f ${imageName}"
@@ -519,7 +522,7 @@ node {
                   try {
                     sh 'echo Cleanup is enabled'
 
-                    sh "docker run --volumes-from ${buildTestContainer} --name ${cleanupTestContainer} -t --env-file ${envFile} " +
+                    sh "docker run --volumes-from ${buildTestContainer} --name ${cleanupContainer} -t --env-file ${envFile} " +
                       "${golangImageName} sh -c \"${workPath}pipeline/scripts/rancher_cleanup.sh\""
 
                     sh "docker stop ${cleanupContainer}"

diff --git a/tests/v2/validation/upgrade/kubernetes.go b/tests/v2/validation/upgrade/kubernetes.go
@@ -73,6 +73,14 @@ func upgradeLocalCluster(u *suite.Suite, testName string, client *rancher.Client
 		err = waitForLocalClusterUpgrade(client, clusterMeta.ID)
 		require.NoError(u.T(), err)
 
+		err = kwait.PollUntilContextTimeout(context.TODO(), 2*time.Second, defaults.FiveSecondTimeout, true, func(ctx context.Context) (done bool, err error) {
+			isConnected, err := client.IsConnected()
+			require.NoError(u.T(), err)
+
+			return isConnected, nil
+		})
+		require.NoError(u.T(), err)
+
 		upgradedCluster, err := client.Management.Cluster.ByID(updatedCluster.Meta.ID)
 		require.NoError(u.T(), err)
 		require.Contains(u.T(), testConfig.KubernetesVersion, upgradedCluster.Version.GitVersion)