From 407b8e0dae0464b69e5c4d1812ae845c592fc900 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Markus=20Th=C3=B6mmes?= Date: Tue, 1 Oct 2019 08:53:32 +0200 Subject: [PATCH 1/2] Add Golang 1.13.1 to CI. --- projects/origin-release/Makefile | 1 + .../origin-release/golang-1.13/Dockerfile | 53 ++++++++++++++++++ ...s-paas7-openshift-multiarch-el7-build.repo | 8 +++ .../golang-1.13/golang-v1.13.0-1.noarch.rpm | Bin 0 -> 5632 bytes .../origin-release/golang-1.13/golang.spec | 21 +++++++ 5 files changed, 83 insertions(+) create mode 100644 projects/origin-release/golang-1.13/Dockerfile create mode 100644 projects/origin-release/golang-1.13/cbs-paas7-openshift-multiarch-el7-build.repo create mode 100644 projects/origin-release/golang-1.13/golang-v1.13.0-1.noarch.rpm create mode 100644 projects/origin-release/golang-1.13/golang.spec diff --git a/projects/origin-release/Makefile b/projects/origin-release/Makefile index 99b8916a5a2f9..777e2a3e0bfae 100644 --- a/projects/origin-release/Makefile +++ b/projects/origin-release/Makefile @@ -4,4 +4,5 @@ build: ./fake-rpm.sh golang-1.10 ./fake-rpm.sh golang-1.11 ./fake-rpm.sh golang-1.12 + ./fake-rpm.sh golang-1.13 .PHONY: build diff --git a/projects/origin-release/golang-1.13/Dockerfile b/projects/origin-release/golang-1.13/Dockerfile new file mode 100644 index 0000000000000..1e1369a39d9d1 --- /dev/null +++ b/projects/origin-release/golang-1.13/Dockerfile @@ -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." diff --git a/projects/origin-release/golang-1.13/cbs-paas7-openshift-multiarch-el7-build.repo b/projects/origin-release/golang-1.13/cbs-paas7-openshift-multiarch-el7-build.repo new file mode 100644 index 0000000000000..aa32f81b67962 --- /dev/null +++ b/projects/origin-release/golang-1.13/cbs-paas7-openshift-multiarch-el7-build.repo @@ -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* diff --git a/projects/origin-release/golang-1.13/golang-v1.13.0-1.noarch.rpm b/projects/origin-release/golang-1.13/golang-v1.13.0-1.noarch.rpm new file mode 100644 index 0000000000000000000000000000000000000000..71f80e0fc192ac6903160c28454855b8927d1537 GIT binary patch literal 5632 zcmeI0&5ImG7{+UMM-zjFl{FXzv6URMYB&8g)7>KL#;j{RXcqLKppfe7>ggua(?j>{ z=0guEg0PWAl7Kf)IS5e^74IVWCn)H}gF+ILXdp%}aeUsHcZdicJlnNYKl7`%zWSlr z!*k{Q)gR^sTB}#~<)CM7I+o*Ew&~E|e{6fiZU0=c{qcnskL?g*;S2m;MyKEBpbI$o zF6iy()G)VoH+>A;C}qTH_bWfa6Z z37KNI#(Wb>^@90N=Fybf_b|W4d@q#V?<_jrsl69U=bb}GWYxY8O7%~f z?`Iw}?}y^N)*dMC(+;6n-!h=Y5ftlN`mM=y1f~0a#{4ss=3gg1D5m+H;QUTF;+fLO z2lYty`$k%og;AFqmD2wU5 z=tgb4n0@^v-mo^Fn7!;urISpKEL9fEhCNwo8qW^$Q7-$2$`Fg{T~8lgo0u?t?40?G zGtI-UVfKU?=B4PJ%!eXkXUwcDbX@6UCL6|UH%6%$3QvYH zNc_1N*+(`_O^y50*bUu(h>y=ZX;DUcB6)VDc{+n*`PX literal 0 HcmV?d00001 diff --git a/projects/origin-release/golang-1.13/golang.spec b/projects/origin-release/golang-1.13/golang.spec new file mode 100644 index 0000000000000..eb9c9ef05be1e --- /dev/null +++ b/projects/origin-release/golang-1.13/golang.spec @@ -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 +* Wed Mar 20 2019 Markus Thömmes 0.0-1 +- Initial change +EOF From 42d168ad228e8899f51847ea4dbd2a2dcd350925 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Markus=20Th=C3=B6mmes?= Date: Tue, 1 Oct 2019 09:19:51 +0200 Subject: [PATCH 2/2] Fix date. --- projects/origin-release/golang-1.13/golang.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/projects/origin-release/golang-1.13/golang.spec b/projects/origin-release/golang-1.13/golang.spec index eb9c9ef05be1e..464f16e229d52 100644 --- a/projects/origin-release/golang-1.13/golang.spec +++ b/projects/origin-release/golang-1.13/golang.spec @@ -16,6 +16,6 @@ BuildArch: noarch %files %defattr(-,root,root,-) %changelog -* Wed Mar 20 2019 Markus Thömmes 0.0-1 +* Tue Oct 1 2019 Markus Thömmes 0.0-1 - Initial change EOF