diff --git a/.travis.yml b/.travis.yml index 65097491d5f3..977712f351e3 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,7 +1,7 @@ language: go go: - - 1.7 + - 1.11 install: - export PATH=$GOPATH/bin:./_output/tools/etcd/bin:$PATH diff --git a/hack/lib/constants.sh b/hack/lib/constants.sh index 429c63ccec3e..fa8bcdff2638 100755 --- a/hack/lib/constants.sh +++ b/hack/lib/constants.sh @@ -4,7 +4,7 @@ readonly OS_GO_PACKAGE=github.com/openshift/origin -readonly OS_BUILD_ENV_GOLANG="${OS_BUILD_ENV_GOLANG:-1.10}" +readonly OS_BUILD_ENV_GOLANG="${OS_BUILD_ENV_GOLANG:-1.11}" readonly OS_BUILD_ENV_IMAGE="${OS_BUILD_ENV_IMAGE:-openshift/origin-release:golang-${OS_BUILD_ENV_GOLANG}}" readonly OS_REQUIRED_GO_VERSION="go${OS_BUILD_ENV_GOLANG}" readonly OS_GLIDE_MINOR_VERSION="13" diff --git a/images/cli-artifacts/Dockerfile.rhel b/images/cli-artifacts/Dockerfile.rhel index ec93ddd484f0..68601874dc51 100644 --- a/images/cli-artifacts/Dockerfile.rhel +++ b/images/cli-artifacts/Dockerfile.rhel @@ -2,7 +2,7 @@ # It builds an image containing the Mac version of the installer layered on top of the # Linux installer image. -FROM registry.svc.ci.openshift.org/ocp/builder:golang-1.10 AS builder +FROM registry.svc.ci.openshift.org/ocp/builder:golang-1.11 AS builder WORKDIR /go/src/github.com/openshift/origin COPY . . RUN OS_RELEASE_WITHOUT_LINKS=y OS_BUILD_RELEASE_ARCHIVES=n OS_ONLY_BUILD_PLATFORMS="^(darwin|windows)/amd64$" bash -x hack/build-cross.sh diff --git a/images/cli/Dockerfile.rhel b/images/cli/Dockerfile.rhel index e10911d71a4f..38b68764b3e2 100644 --- a/images/cli/Dockerfile.rhel +++ b/images/cli/Dockerfile.rhel @@ -1,4 +1,4 @@ -FROM registry.svc.ci.openshift.org/ocp/builder:golang-1.10 AS builder +FROM registry.svc.ci.openshift.org/ocp/builder:golang-1.11 AS builder WORKDIR /go/src/github.com/openshift/origin COPY . . RUN make build WHAT=cmd/oc; \ diff --git a/images/hyperkube/Dockerfile.rhel b/images/hyperkube/Dockerfile.rhel index a61fefbdd8dd..6956eb6d90fe 100644 --- a/images/hyperkube/Dockerfile.rhel +++ b/images/hyperkube/Dockerfile.rhel @@ -1,4 +1,4 @@ -FROM registry.svc.ci.openshift.org/ocp/builder:golang-1.10 AS builder +FROM registry.svc.ci.openshift.org/ocp/builder:golang-1.11 AS builder WORKDIR /go/src/github.com/openshift/origin COPY . . RUN make build WHAT=vendor/k8s.io/kubernetes/cmd/hyperkube; \ diff --git a/images/hypershift/Dockerfile.rhel b/images/hypershift/Dockerfile.rhel index 10586c2a431a..76ba3b3d82ba 100644 --- a/images/hypershift/Dockerfile.rhel +++ b/images/hypershift/Dockerfile.rhel @@ -1,4 +1,4 @@ -FROM registry.svc.ci.openshift.org/ocp/builder:golang-1.10 AS builder +FROM registry.svc.ci.openshift.org/ocp/builder:golang-1.11 AS builder WORKDIR /go/src/github.com/openshift/origin COPY . . RUN make build WHAT=cmd/hypershift; \ diff --git a/images/sdn/Dockerfile.rhel b/images/sdn/Dockerfile.rhel index e3fd69933697..d3bb30103f83 100644 --- a/images/sdn/Dockerfile.rhel +++ b/images/sdn/Dockerfile.rhel @@ -1,4 +1,4 @@ -FROM registry.svc.ci.openshift.org/ocp/builder:golang-1.10 AS builder +FROM registry.svc.ci.openshift.org/ocp/builder:golang-1.11 AS builder WORKDIR /go/src/github.com/openshift/origin COPY . . RUN make build WHAT=" \ diff --git a/images/template-service-broker/Dockerfile.rhel b/images/template-service-broker/Dockerfile.rhel index 2ab7890f2684..9432cc17cb77 100644 --- a/images/template-service-broker/Dockerfile.rhel +++ b/images/template-service-broker/Dockerfile.rhel @@ -1,4 +1,4 @@ -FROM registry.svc.ci.openshift.org/ocp/builder:golang-1.10 AS builder +FROM registry.svc.ci.openshift.org/ocp/builder:golang-1.11 AS builder WORKDIR /go/src/github.com/openshift/origin COPY . . RUN make build WHAT=cmd/template-service-broker; \ diff --git a/images/tests/Dockerfile.rhel b/images/tests/Dockerfile.rhel index 90e4c5361f45..d81d51322f54 100644 --- a/images/tests/Dockerfile.rhel +++ b/images/tests/Dockerfile.rhel @@ -1,4 +1,4 @@ -FROM registry.svc.ci.openshift.org/ocp/builder:golang-1.10 AS builder +FROM registry.svc.ci.openshift.org/ocp/builder:golang-1.11 AS builder WORKDIR /go/src/github.com/openshift/origin COPY . . RUN make build WHAT=cmd/openshift-tests; \ diff --git a/origin.spec b/origin.spec index 3751cf07f7bd..3250eb43bc63 100644 --- a/origin.spec +++ b/origin.spec @@ -6,7 +6,7 @@ %global gopath %{_datadir}/gocode %global import_path github.com/openshift/origin -%global golang_version 1.10 +%global golang_version 1.11 # %commit and %os_git_vars are intended to be set by tito custom builders provided # in the .tito/lib directory. The values in this spec file will not be kept up to date. %{!?commit: