-
Notifications
You must be signed in to change notification settings - Fork 2.1k
Add Golang 1.13.1 to CI. #5236
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Merged
openshift-merge-robot
merged 2 commits into
openshift:master
from
markusthoemmes:golang1.13
Oct 1, 2019
Merged
Add Golang 1.13.1 to CI. #5236
Changes from all commits
Commits
Show all changes
2 commits
Select commit
Hold shift + click to select a range
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,53 @@ | ||
| # | ||
| # This is the image that controls the standard build environment for releasing OpenShift Origin. | ||
| # It is responsible for performing a cross platform build of OpenShift. | ||
| # | ||
| # The standard name for this image is openshift/origin-release | ||
| # | ||
| FROM centos:7 | ||
|
|
||
| ENV VERSION=1.13.1 \ | ||
| GOCACHE=/go/.cache \ | ||
| GOARM=5 \ | ||
| GOPATH=/go \ | ||
| GOROOT=/usr/local/go \ | ||
| LOGNAME=deadbeef | ||
| ENV PATH=$PATH:$GOROOT/bin:$GOPATH/bin | ||
|
|
||
| COPY cbs-paas7-openshift-multiarch-el7-build.repo /etc/yum.repos.d/ | ||
| RUN yum install -y epel-release && \ | ||
| rpm -V epel-release && \ | ||
| INSTALL_PKGS="bc bind-utils bsdtar bzr ceph-common createrepo device-mapper device-mapper-persistent-data e2fsprogs ethtool file findutils gcc git glibc-static glib2-devel gpgme gpgme-devel hostname iptables jq krb5-devel libassuan libassuan-devel libseccomp-devel libvirt-devel lsof make mercurial nmap-ncat openssl protobuf-compiler rsync socat systemd-devel sysvinit-tools tar tito tree util-linux wget which xfsprogs zip goversioninfo" && \ | ||
| yum install -y $INSTALL_PKGS && \ | ||
| rpm -V $INSTALL_PKGS && \ | ||
| yum clean all && \ | ||
| touch /os-build-image && \ | ||
| git config --system user.name origin-release-container && \ | ||
| git config --system user.email origin-release@redhat.com | ||
|
|
||
| ADD *.rpm /tmp/origin-rpm/ | ||
| RUN yum install -y /tmp/origin-rpm/*.rpm && \ | ||
| yum clean all && \ | ||
| curl https://storage.googleapis.com/golang/go$VERSION.linux-$(uname -m | sed 's/x86_64/amd64/g').tar.gz | tar -C /usr/local -xzf - && \ | ||
| go get golang.org/x/tools/cmd/cover \ | ||
| github.com/Masterminds/glide \ | ||
| golang.org/x/tools/cmd/goimports \ | ||
| github.com/tools/godep \ | ||
| golang.org/x/lint/golint \ | ||
| github.com/openshift/release/tools/gotest2junit \ | ||
| github.com/openshift/imagebuilder/cmd/imagebuilder && \ | ||
| mv $GOPATH/bin/* /usr/bin/ && \ | ||
| rm -rf $GOPATH/* $GOPATH/.cache && \ | ||
| mkdir $GOPATH/bin && \ | ||
| ln -s /usr/bin/imagebuilder $GOPATH/bin/imagebuilder && \ | ||
| ln -s /usr/bin/goimports $GOPATH/bin/goimports && \ | ||
| curl -L https://github.com/golang/dep/releases/download/v0.5.4/dep-linux-amd64 > /usr/bin/dep && \ | ||
| chmod +x /usr/bin/dep | ||
| # TODO: symlink for backwards compatibility with hack/build-images.sh only, remove | ||
|
|
||
| RUN chmod g+xw -R $GOPATH && \ | ||
| chmod g+xw -R $(go env GOROOT) | ||
|
|
||
| WORKDIR /go/src/github.com/openshift/origin | ||
| LABEL io.k8s.display-name="OpenShift Origin Release Environment (golang-$VERSION)" \ | ||
| io.k8s.description="This is the standard release image for OpenShift Origin and contains the necessary build tools to build the platform." |
8 changes: 8 additions & 0 deletions
8
projects/origin-release/golang-1.13/cbs-paas7-openshift-multiarch-el7-build.repo
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,8 @@ | ||
| [cbs-paas7-openshift-multiarch-el7-build] | ||
| name = CBS OpenShift MultiArch Build | ||
| baseurl = http://cbs.centos.org/kojifiles/repos/paas7-openshift-multiarch-el7-build/latest/$basearch | ||
| enabled = 1 | ||
| gpgcheck = 0 | ||
| sslverify = 0 | ||
| skip_if_unavailable = 1 | ||
| includepkgs = golang* protobuf* goversioninfo* openvswitch* |
Binary file not shown.
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,21 @@ | ||
| Name: golang | ||
| Version: v1.13.0 | ||
| Release: 1%{?dist} | ||
| Summary: Go install from source | ||
| Group: Fake | ||
| License: BSD | ||
| BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX) | ||
| Provides: golang | ||
| BuildArch: noarch | ||
| %description | ||
| %{summary} | ||
| %prep | ||
| %setup -c -T | ||
| %build | ||
| %install | ||
| %files | ||
| %defattr(-,root,root,-) | ||
| %changelog | ||
| * Tue Oct 1 2019 Markus Thömmes <mthoemme@redhat.com> 0.0-1 | ||
| - Initial change | ||
| EOF | ||
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
1.13.0 ? PR says
1.13.1There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Compare with the 1.12 file. This is for building fake RPMs only and it has been kept at 1.12.0 as well although the version is actually at 1.12.9 now.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
ah... does not make sense, but ok :-)