This is an automated email from the ASF dual-hosted git repository.
wohali pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/couchdb-ci.git
The following commit(s) were added to refs/heads/master by this push:
new 6a27ce6 fdb bump, bionic mozjs fix, automation improvement
6a27ce6 is described below
commit 6a27ce62912d0b313bef237552eb32d6428b2ce9
Author: Joan Touzet <[email protected]>
AuthorDate: Tue May 12 21:05:37 2020 -0700
fdb bump, bionic mozjs fix, automation improvement
---
bin/apt-dependencies.sh | 7 ++++---
bin/yum-dependencies.sh | 9 +++++----
build.sh | 16 ++++++++++++++--
3 files changed, 23 insertions(+), 9 deletions(-)
diff --git a/bin/apt-dependencies.sh b/bin/apt-dependencies.sh
index 8e29b23..f35ddb2 100755
--- a/bin/apt-dependencies.sh
+++ b/bin/apt-dependencies.sh
@@ -170,7 +170,7 @@ if [ "$1" != "nojs" ]; then
apt-get install -y couch-libmozjs185-dev
fi
# newer releases have newer libmozjs
- if [ "${VERSION_CODENAME}" == "bionic" -o "${VERSION_CODENAME}" == "buster"
]; then
+ if [ "${VERSION_CODENAME}" == "buster" ]; then
apt-get install -y libmozjs-60-dev
fi
if [ "${VERSION_CODENAME}" == "focal" ]; then
@@ -185,11 +185,12 @@ fi
# Erlang is installed by apt-erlang.sh
# FoundationDB
-wget
https://www.foundationdb.org/downloads/6.2.15/ubuntu/installers/foundationdb-clients_6.2.15-1_amd64.deb
-wget
https://www.foundationdb.org/downloads/6.2.15/ubuntu/installers/foundationdb-server_6.2.15-1_amd64.deb
+wget
https://www.foundationdb.org/downloads/6.2.20/ubuntu/installers/foundationdb-clients_6.2.20-1_amd64.deb
+wget
https://www.foundationdb.org/downloads/6.2.20/ubuntu/installers/foundationdb-server_6.2.20-1_amd64.deb
dpkg -i ./foundationdb*deb
pkill -f fdb || true
pkill -f foundation || true
+rm -rf ./foundationdb*deb
# clean up
apt-get clean
diff --git a/bin/yum-dependencies.sh b/bin/yum-dependencies.sh
index fb6407c..2ccd32c 100755
--- a/bin/yum-dependencies.sh
+++ b/bin/yum-dependencies.sh
@@ -200,17 +200,18 @@ fi
# FoundationDB
if [[ ${VERSION_ID} -eq 6 ]]; then
- wget
https://www.foundationdb.org/downloads/6.2.15/rhel6/installers/foundationdb-clients-6.2.15-1.el6.x86_64.rpm
- wget
https://www.foundationdb.org/downloads/6.2.15/rhel6/installers/foundationdb-server-6.2.15-1.el6.x86_64.rpm
+ wget
https://www.foundationdb.org/downloads/6.2.20/rhel6/installers/foundationdb-clients-6.2.20-1.el6.x86_64.rpm
+ wget
https://www.foundationdb.org/downloads/6.2.20/rhel6/installers/foundationdb-server-6.2.20-1.el6.x86_64.rpm
yum --nogpgcheck localinstall -y foundationdb*rpm
else
- wget
https://www.foundationdb.org/downloads/6.2.15/rhel7/installers/foundationdb-clients-6.2.15-1.el7.x86_64.rpm
- wget
https://www.foundationdb.org/downloads/6.2.15/rhel7/installers/foundationdb-server-6.2.15-1.el7.x86_64.rpm
+ wget
https://www.foundationdb.org/downloads/6.2.20/rhel7/installers/foundationdb-clients-6.2.20-1.el7.x86_64.rpm
+ wget
https://www.foundationdb.org/downloads/6.2.20/rhel7/installers/foundationdb-server-6.2.20-1.el7.x86_64.rpm
# Buggy FoundationDB packages require this workaround
rpm -i --nodeps ./foundationdb*rpm
fi
pkill -f fdb || true
pkill -f foundation || true
+rm -rf ./foundationdb*rpm
# clean up
yum clean all -y
diff --git a/build.sh b/build.sh
index 77aabf8..6d5f7d3 100755
--- a/build.sh
+++ b/build.sh
@@ -40,7 +40,9 @@ SCRIPTPATH="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
DEBIANS="debian-stretch debian-buster"
UBUNTUS="ubuntu-xenial ubuntu-bionic ubuntu-focal"
CENTOSES="centos-6 centos-7 centos-8"
-
+ERLANGALL_BASE="debian-buster"
+XPLAT_BASE="debian-buster"
+XPLAT_ARCHES="arm64v8 ppc64le"
BINTRAY_API="https://api.bintray.com";
@@ -92,10 +94,17 @@ find-erlang-version() {
fi
}
+pull-os-image() {
+ image_name=$(echo $1 | tr "-" ":")
+ docker pull $image_name
+}
+
build-platform() {
find-erlang-version $1
+ pull-os-image $1
docker build -f dockerfiles/$1 \
$buildargs \
+ --no-cache \
--tag couchdbdev/${CONTAINERARCH}$1-erlang-${ERLANGVERSION} \
${SCRIPTPATH}
}
@@ -178,7 +187,10 @@ case "$1" in
shift
for plat in $DEBIANS $UBUNTUS $CENTOSES; do
build-platform $plat $*
- ERLANGVERSION=all build-platform debian-buster
+ done
+ ERLANGVERSION=all build-platform $ERLANGALL_BASE
+ for arch in $XPLAT_ARCHES; do
+ CONTAINERARCH=$arch build-platform $XPLAT_BASE
done
;;
platform-upload)
