[couchdb-ci] 01/07: Restrict FDB to amd64 containers for now

[va...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

vatamane pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/couchdb-ci.git

commit 38da648750902aa5218363d759ae714e331917b2
Author: Adam Kocoloski <ko...@apache.org>
AuthorDate: Mon Feb 7 20:39:24 2022 -0500

    Restrict FDB to amd64 containers for now
---
 bin/apt-dependencies.sh | 21 ---------------------
 bin/yum-dependencies.sh | 14 +++++---------
 2 files changed, 5 insertions(+), 30 deletions(-)

diff --git a/bin/apt-dependencies.sh b/bin/apt-dependencies.sh
index f8b6394..483e786 100755
--- a/bin/apt-dependencies.sh
+++ b/bin/apt-dependencies.sh
@@ -178,7 +178,6 @@ fi
 # Erlang is installed by apt-erlang.sh
 
 # FoundationDB - but only for amd64 right now!!!!
-# TODO: fix for ppc64le and s390x - get IBM to help build these packages maybe?
 if [ "${ARCH}" == "x86_64" ]; then
   wget https://github.com/apple/foundationdb/releases/download/6.3.23/foundationdb-clients_6.3.23-1_amd64.deb
   wget https://github.com/apple/foundationdb/releases/download/6.3.23/foundationdb-server_6.3.23-1_amd64.deb
@@ -186,26 +185,6 @@ if [ "${ARCH}" == "x86_64" ]; then
   pkill -f fdb || true
   pkill -f foundation || true
   rm -rf ./foundationdb*deb
-else
-  apt install --no-install-recommends -y cmake mono-devel ninja-build libboost-all-dev liblz4-dev dos2unix fakeroot liblz4-1
-  git clone https://github.com/apple/foundationdb/
-  cd foundationdb && git checkout 6.3.23
-  git apply /root/couchdb-ci/files/no-bintray.patch || true
-  mkdir .build && cd .build
-  if [ "${ARCH}" == "ppc64le" ]; then
-    cmake -DCMAKE_CXX_FLAGS="-DNO_WARN_X86_INTRINSICS" -G Ninja ..
-  else
-    cmake -G Ninja ..
-  fi
-  ninja -j2
-  fakeroot cpack -G DEB
-  # see https://forums.foundationdb.org/t/possible-missing-dependency-in-6-3-x-deb-package/2579
-  ln -nfs /usr/bin/update-alternatives /usr/bin/alternatives
-  mkdir -p /var/lib/foundationdb/data
-  dpkg -i packages/foundationdb-clients*deb packages/foundationdb-server*deb || true
-  apt purge -y cmake mono-devel ninja-build libboost-all-dev liblz4-dev dos2unix
-  apt autoremove -y
-  cd ../../ && rm -rf foundationdb
 fi
 
 # clean up
diff --git a/bin/yum-dependencies.sh b/bin/yum-dependencies.sh
index 2886cd8..6d5f322 100755
--- a/bin/yum-dependencies.sh
+++ b/bin/yum-dependencies.sh
@@ -192,20 +192,16 @@ else
   yum install -y libffi-devel
 fi
 
-# FoundationDB
-if [[ ${VERSION_ID} -eq 6 ]]; then
-  wget https://github.com/apple/foundationdb/releases/download/6.3.23/foundationdb-clients-6.3.23-1.el6.x86_64.rpm
-  wget https://github.com/apple/foundationdb/releases/download/6.3.23/foundationdb-server-6.3.23-1.el6.x86_64.rpm
-  yum --nogpgcheck localinstall -y foundationdb*rpm
-else
+# FoundationDB - but only for amd64 right now!!!!
+if [ "${ARCH}" == "x86_64" ]; then
   wget https://github.com/apple/foundationdb/releases/download/6.3.23/foundationdb-clients-6.3.23-1.el7.x86_64.rpm
   wget https://github.com/apple/foundationdb/releases/download/6.3.23/foundationdb-server-6.3.23-1.el7.x86_64.rpm
   # Buggy FoundationDB packages require this workaround
   rpm -i --nodeps ./foundationdb*rpm
+  pkill -f fdb || true
+  pkill -f foundation || true
+  rm -rf ./foundationdb*rpm
 fi
-pkill -f fdb || true
-pkill -f foundation || true
-rm -rf ./foundationdb*rpm
 
 # clean up
 yum clean all -y