Skip to content

Commit 76fb8ff

Browse files
authored
Merge pull request #142 from cofyc/disable_multi_arch
disable non-amd64 arches
2 parents e65237d + bed407a commit 76fb8ff

File tree

2 files changed

+7
-2
lines changed

2 files changed

+7
-2
lines changed

hack/e2e.go

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -92,6 +92,8 @@ func wait(cmd string, args ...string) error {
9292
c := exec.Command(cmd, args...)
9393
c.Stdout = os.Stdout
9494
c.Stderr = os.Stderr
95+
c.Env = append(c.Env, os.Environ()...)
96+
c.Env = append(c.Env, "GO111MODULE=on")
9597
if err := c.Start(); err != nil {
9698
return err
9799
}
@@ -158,7 +160,7 @@ func (t tester) getKubetest(get bool, old time.Duration) (string, error) {
158160
return "", fmt.Errorf("Cannot install kubetest until $GOPATH is set")
159161
}
160162
log.Print("Updating kubetest binary...")
161-
cmd := []string{"go", "get", "-u", "k8s.io/test-infra/kubetest"}
163+
cmd := []string{"go", "get", "k8s.io/test-infra/kubetest"}
162164
if err = t.wait(cmd[0], cmd[1:]...); err != nil {
163165
return "", fmt.Errorf("%s: %v", strings.Join(cmd, " "), err) // Could not upgrade
164166
}

hack/release.sh

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -79,7 +79,10 @@ ALLOW_UNSTABLE=${ALLOW_UNSTABLE:-}
7979
ALLOW_DIRTY=${ALLOW_DIRTY:-}
8080
ALLOW_OVERRIDE=${ALLOW_OVERRIDE:-}
8181
SKIP_BUILD=${SKIP_BUILD:-}
82-
ALL_ARCH="amd64 arm arm64 ppc64le s390x"
82+
# There is a problem in building multi-arch images in prow environment. Enable non-amd64
83+
# arches when we have a reliable way, see https://github.com/kubernetes/test-infra/issues/13937.
84+
#ALL_ARCH="amd64 arm arm64 ppc64le s390x"
85+
ALL_ARCH="amd64"
8386
IMAGE="$REGISTRY/local-volume-provisioner"
8487

8588
# In prow job, DOCKER_CONFIG is mounted read-only, but docker manifest command

0 commit comments

Comments
 (0)