diff --git a/test/e2e_node/jenkins/gci-init.yaml b/test/e2e_node/jenkins/gci-init.yaml index 93a98e9eab3..8b3cb6c7bc9 100644 --- a/test/e2e_node/jenkins/gci-init.yaml +++ b/test/e2e_node/jenkins/gci-init.yaml @@ -6,5 +6,7 @@ runcmd: - mkdir -p /home/kubernetes/bin/ - mount -B /home/kubernetes/bin /home/kubernetes/bin - mount -B -o remount,exec /home/kubernetes/bin - - wget https://storage.googleapis.com/kubernetes-release/rkt/rkt-v1.18.0 -O /home/kubernetes/bin/rkt + - wget https://storage.googleapis.com/kubernetes-release/rkt/v1.18.0/rkt -O /home/kubernetes/bin/rkt + - wget https://storage.googleapis.com/kubernetes-release/rkt/v1.18.0/stage1-fly.aci -O /home/kubernetes/bin/stage1-fly.aci + - wget https://storage.googleapis.com/kubernetes-release/gci-mounter/gci-mounter-v2.aci -O /home/kubernetes/bin/gci-mounter-v2.aci - chmod a+x /home/kubernetes/bin/rkt diff --git a/test/e2e_node/remote/remote.go b/test/e2e_node/remote/remote.go index b1787721893..7239b86b2d9 100644 --- a/test/e2e_node/remote/remote.go +++ b/test/e2e_node/remote/remote.go @@ -45,8 +45,6 @@ const ( archiveName = "e2e_node_test.tar.gz" CNIRelease = "07a8a28637e97b22eb8dfe710eeae1344f69d16e" CNIDirectory = "cni" - // Note: This path needs to be in sync with the "target" path for `/` in cluster/gce/gci/mounter/mounter - mounterRootfsPath string = "/media/root" ) var CNIURL = fmt.Sprintf("https://storage.googleapis.com/kubernetes-release/network-plugins/cni-%s.tar.gz", CNIRelease) @@ -115,7 +113,7 @@ func CreateTestArchive() (string, error) { } } - // Include the GCI mounter in the deployed tarball + // Include the GCI mounter artifacts in the deployed tarball k8sDir, err := builder.GetK8sRootDir() if err != nil { return "", fmt.Errorf("Could not find K8s root dir! Err: %v", err) @@ -283,7 +281,6 @@ func RunRemote(archive string, host string, cleanup bool, junitFilePrefix string return "", false, err } // Insert args at beginning of testArgs, so any values from command line take precedence - testArgs = fmt.Sprintf("--experimental-mounter-rootfs-path=%s ", mounterRootfsPath) + testArgs testArgs = fmt.Sprintf("--experimental-mounter-path=%s ", mounterPath) + testArgs } diff --git a/test/e2e_node/services/services.go b/test/e2e_node/services/services.go index 8b998735e93..3e71b06d423 100644 --- a/test/e2e_node/services/services.go +++ b/test/e2e_node/services/services.go @@ -207,9 +207,7 @@ func (e *E2EServices) startKubelet() (*server, error) { "--feature-gates", framework.TestContext.FeatureGates, "--v", LOG_VERBOSITY_LEVEL, "--logtostderr", - // Temporarily disabled: - // "--experimental-mounter-path", framework.TestContext.MounterPath, - // "--experimental-mounter-rootfs-path", framework.TestContext.MounterRootfsPath, + "--experimental-mounter-path", framework.TestContext.MounterPath, ) if framework.TestContext.EnableCRI {