Giuseppe Lavagetto has submitted this change and it was merged.
Change subject: profile::calico::builder: fix build-calico, add fakeroot
......................................................................
profile::calico::builder: fix build-calico, add fakeroot
Change-Id: I8802835d9da773c6736802c1bd8adb5da4b69d7b
---
M modules/profile/manifests/calico/builder.pp
M modules/profile/templates/calico/build-calico.sh.erb
2 files changed, 7 insertions(+), 7 deletions(-)
Approvals:
Giuseppe Lavagetto: Looks good to me, approved
jenkins-bot: Verified
diff --git a/modules/profile/manifests/calico/builder.pp
b/modules/profile/manifests/calico/builder.pp
index ed2960f..4dee7c3 100644
--- a/modules/profile/manifests/calico/builder.pp
+++ b/modules/profile/manifests/calico/builder.pp
@@ -23,7 +23,7 @@
ensure => present,
}
- require_package('build-essential')
+ require_package('build-essential', 'fakeroot')
if $proxy_address {
file_line { 'Docker proxy':
diff --git a/modules/profile/templates/calico/build-calico.sh.erb
b/modules/profile/templates/calico/build-calico.sh.erb
index 7f9a6d6..d58857f 100755
--- a/modules/profile/templates/calico/build-calico.sh.erb
+++ b/modules/profile/templates/calico/build-calico.sh.erb
@@ -16,12 +16,12 @@
popd
# Now build calicoctl
base=$(mktemp -d)
-GOPATH="${base}/gopath"
+export GOPATH="${base}/gopath"
_go_base="${GOPATH}/src/github.com/projectcalico/"
mkdir -p $_go_base
cp -r $_dir $_go_base
-cd "${go_base}/calico-containers" && glide install && \
- make release/calicoctl
+(cd "${_go_base}/calico-containers" && glide install && \
+ make dist-calicoctl)
base_deb=${base}/debian
# Debian control file
mkdir -p ${base_deb}/DEBIAN
@@ -29,13 +29,13 @@
# The actual binary
mkdir -p ${base_deb}/usr/bin
-cp "${go_base}/calico-containers/release/calicoctl-*"
${base_deb}/usr/bin/calicoctl
+cp "${_go_base}/calico-containers/dist/calicoctl" ${base_deb}/usr/bin/calicoctl
# Changelog, etc
deb_doc="${base_deb}/usr/share/doc/calicoctl"
mkdir -p ${deb_doc}
-gzip -c ${_dir}/debian/Changelog > ${deb_doc}/changelog.Debian.gz
-gzip -c ${_dir}/debian/Changelog > ${deb_doc}/changelog.gz
+gzip -c ${_dir}/debian/changelog > ${deb_doc}/changelog.Debian.gz
+gzip -c ${_dir}/debian/changelog > ${deb_doc}/changelog.gz
cp -ax ${_dir}/debian/copyright ${deb_doc}/copyright
# Lintian, forgive me
--
To view, visit https://gerrit.wikimedia.org/r/321672
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I8802835d9da773c6736802c1bd8adb5da4b69d7b
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Giuseppe Lavagetto <glavage...@wikimedia.org>
Gerrit-Reviewer: Giuseppe Lavagetto <glavage...@wikimedia.org>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
