-
Notifications
You must be signed in to change notification settings - Fork 1.3k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #8157 from nelljerram/bionic-use-v3.26
Drop support for OpenStack on Ubuntu Bionic and older
- Loading branch information
Showing
15 changed files
with
13 additions
and
262 deletions.
There are no files selected for viewing
This file contains 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 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 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 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 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 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
8 changes: 0 additions & 8 deletions
8
hack/release/packaging/docker-build-images/ubuntu-bionic-build.Dockerfile.amd64
This file was deleted.
Oops, something went wrong.
8 changes: 0 additions & 8 deletions
8
hack/release/packaging/docker-build-images/ubuntu-bionic-build.Dockerfile.ppc64le
This file was deleted.
Oops, something went wrong.
8 changes: 0 additions & 8 deletions
8
hack/release/packaging/docker-build-images/ubuntu-trusty-build.Dockerfile.amd64
This file was deleted.
Oops, something went wrong.
8 changes: 0 additions & 8 deletions
8
hack/release/packaging/docker-build-images/ubuntu-trusty-build.Dockerfile.ppc64le
This file was deleted.
Oops, something went wrong.
8 changes: 0 additions & 8 deletions
8
hack/release/packaging/docker-build-images/ubuntu-xenial-build.Dockerfile.amd64
This file was deleted.
Oops, something went wrong.
8 changes: 0 additions & 8 deletions
8
hack/release/packaging/docker-build-images/ubuntu-xenial-build.Dockerfile.ppc64le
This file was deleted.
Oops, something went wrong.
This file contains 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 |
---|---|---|
|
@@ -35,7 +35,7 @@ fi | |
|
||
# We used to have some Semaphore environment-dependent logic here, but we now | ||
# place that in the Semaphore YAML (which is a more appropriate place for it). | ||
: ${STEPS:=bld_images net_cal felix etcd3gw dnsmasq nettle ${pub_steps}} | ||
: ${STEPS:=bld_images net_cal felix etcd3gw dnsmasq ${pub_steps}} | ||
|
||
function check_bin { | ||
which $1 > /dev/null | ||
|
@@ -133,10 +133,6 @@ function precheck_dnsmasq { | |
: | ||
} | ||
|
||
function precheck_nettle { | ||
: | ||
} | ||
|
||
function precheck_pub_debs { | ||
# Check the PPA exists. | ||
require_repo_name | ||
|
@@ -247,16 +243,6 @@ function do_dnsmasq { | |
git clone https://github.com/projectcalico/calico-dnsmasq.git dnsmasq | ||
cd dnsmasq | ||
|
||
# Ubuntu Trusty | ||
git checkout 2.79test1calico1-3-trusty | ||
docker_run_rm calico-build/trusty dpkg-buildpackage -I -S | ||
|
||
# Ubuntu Xenial | ||
git checkout 2.79test1calico1-2-xenial | ||
sed -i s/trusty/xenial/g debian/changelog | ||
git commit -a -m "switch trusty to xenial in debian/changelog" --author="Marvin <[email protected]>" | ||
docker_run_rm calico-build/xenial dpkg-buildpackage -I -S | ||
|
||
# CentOS/RHEL 7 | ||
git checkout origin/rpm_2.79 | ||
docker_run_rm -e EL_VERSION=el7 calico-build/centos7 /code/hack/release/packaging/rpm/build-rpms | ||
|
@@ -270,40 +256,6 @@ function do_dnsmasq { | |
rm -rf ${rootdir}/dnsmasq | ||
} | ||
|
||
function do_nettle { | ||
# nettle-3.3 for Ubuntu Xenial - At the point checked out, the | ||
# Dnsmasq code had this content in debian/shlibs.local: | ||
# | ||
# libnettle 6 libnettle6 (>= 3.3) | ||
# | ||
# This causes the built binary package to depend on libnettle6 >= | ||
# 3.3, which is problematic because that version is not available | ||
# in Xenial. So we also build and upload nettle 3.3 to our PPA. | ||
pushd ${rootdir} | ||
rm -rf nettle | ||
mkdir nettle | ||
cd nettle | ||
wget https://launchpad.net/ubuntu/+archive/primary/+sourcefiles/nettle/3.3-1/nettle_3.3-1.dsc | ||
wget https://launchpad.net/ubuntu/+archive/primary/+sourcefiles/nettle/3.3-1/nettle_3.3.orig.tar.gz | ||
wget https://launchpad.net/ubuntu/+archive/primary/+sourcefiles/nettle/3.3-1/nettle_3.3-1.debian.tar.xz | ||
docker_run_rm calico-build/xenial dpkg-source -x nettle_3.3-1.dsc | ||
rm -rf ../nettle-3.3 | ||
mv nettle-3.3 ../ | ||
cp -a nettle_3.3.orig.tar.gz ../ | ||
cp -a nettle_3.3.orig.tar.gz $outputDir | ||
cd ../nettle-3.3 | ||
sed -i '1 s/unstable/xenial/' debian/changelog | ||
docker_run_rm calico-build/xenial dpkg-buildpackage -S | ||
|
||
# Packages are produced in rootDir/ - move them to the output dir. | ||
find ../ -type f -name 'nettle_*-*' -exec mv '{}' $outputDir \; | ||
|
||
popd | ||
|
||
# Clean up nettle build files. | ||
rm -rf ${rootdir}/nettle ${rootdir}/nettle-3.3 ${rootdir}/nettle_3.3.orig.tar.gz | ||
} | ||
|
||
function do_pub_debs { | ||
# Publish Debian packages. | ||
pushd ${rootdir}/hack/release/packaging/output | ||
|
This file contains 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
Oops, something went wrong.