You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@couchdb.apache.org by rn...@apache.org on 2024/09/02 08:08:11 UTC
(couchdb-ci) branch ubuntu-noble updated (e195fd7 -> caca6e8)
This is an automated email from the ASF dual-hosted git repository.
rnewson pushed a change to branch ubuntu-noble
in repository https://gitbox.apache.org/repos/asf/couchdb-ci.git
discard e195fd7 add ubuntu noble numbat
new caca6e8 add ubuntu noble numbat
This update added new revisions after undoing existing revisions.
That is to say, some revisions that were in the old version of the
branch are not in the new version. This situation occurs
when a user --force pushes a change and generates a repository
containing something like this:
* -- * -- B -- O -- O -- O (e195fd7)
\
N -- N -- N refs/heads/ubuntu-noble (caca6e8)
You should already have received notification emails for all of the O
revisions, and so the following emails describe only the N revisions
from the common base, B.
Any revisions marked "omit" are not gone; other references still
refer to them. Any revisions marked "discard" are gone forever.
The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
dockerfiles/ubuntu-noble | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
(couchdb-ci) 01/01: add ubuntu noble numbat
Posted by rn...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
rnewson pushed a commit to branch ubuntu-noble
in repository https://gitbox.apache.org/repos/asf/couchdb-ci.git
commit caca6e8f8f550cd06a4bd3060a5c6b558f4cb5c2
Author: Robert Newson <Ro...@ibm.com>
AuthorDate: Mon Sep 2 09:05:26 2024 +0100
add ubuntu noble numbat
---
bin/apt-dependencies.sh | 8 ++++--
build.sh | 2 +-
dockerfiles/ubuntu-noble | 66 ++++++++++++++++++++++++++++++++++++++++++++++
pull-all-couchdbdev-docker | 1 +
4 files changed, 74 insertions(+), 3 deletions(-)
diff --git a/bin/apt-dependencies.sh b/bin/apt-dependencies.sh
index c50ef08..e7c6ed9 100755
--- a/bin/apt-dependencies.sh
+++ b/bin/apt-dependencies.sh
@@ -43,7 +43,7 @@ SCRIPTPATH="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
. ${SCRIPTPATH}/detect-arch.sh >/dev/null
. ${SCRIPTPATH}/detect-os.sh >/dev/null
debians='(bullseye|bookworm)'
-ubuntus='(focal|jammy)'
+ubuntus='(focal|jammy|noble)'
echo "Detected Ubuntu/Debian version: ${VERSION_CODENAME} arch: ${ARCH}"
# ubuntu docker image seems to be missing /etc/timezone...
@@ -144,7 +144,8 @@ fi
# js packages, as long as we're not told to skip them
if [ "$1" != "nojs" ]; then
# older releases don't have libmozjs60+, and we provide 1.8.5
- if [ "${VERSION_CODENAME}" != "jammy" ] && \
+ if [ "${VERSION_CODENAME}" != "noble" ] && \
+ [ "${VERSION_CODENAME}" != "jammy" ] && \
[ "${VERSION_CODENAME}" != "focal" ] && \
[ "${VERSION_CODENAME}" != "bullseye" ] && \
[ "${VERSION_CODENAME}" != "bookworm" ] && \
@@ -157,6 +158,9 @@ if [ "$1" != "nojs" ]; then
apt-get install --no-install-recommends -y couch-libmozjs185-dev
fi
# newer releases have newer libmozjs
+ if [ "${VERSION_CODENAME}" == "noble" ]; then
+ apt-get install --no-install-recommends -y libmozjs-102-dev libmozjs-115-dev
+ fi
if [ "${VERSION_CODENAME}" == "focal" ]; then
apt-get install --no-install-recommends -y libmozjs-68-dev
fi
diff --git a/build.sh b/build.sh
index 01642f3..3f34875 100755
--- a/build.sh
+++ b/build.sh
@@ -47,7 +47,7 @@ SCRIPTPATH="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
# script as well
#
DEBIANS="debian-bullseye debian-bookworm"
-UBUNTUS="ubuntu-focal ubuntu-jammy"
+UBUNTUS="ubuntu-focal ubuntu-jammy ubuntu-noble"
CENTOSES="almalinux-8 almalinux-9"
XPLAT_BASE="debian-bullseye"
diff --git a/dockerfiles/ubuntu-noble b/dockerfiles/ubuntu-noble
new file mode 100644
index 0000000..e21ec18
--- /dev/null
+++ b/dockerfiles/ubuntu-noble
@@ -0,0 +1,66 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements. See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership. The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied. See the License for the
+# specific language governing permissions and limitations
+
+# NOTE: These are intended to be built using the arguments as
+# described in ../build.sh. See that script for more details.
+
+FROM ubuntu:noble
+
+# Install Java
+ENV JAVA_HOME=/opt/java/openjdk
+COPY --from=eclipse-temurin:11 $JAVA_HOME $JAVA_HOME
+ENV PATH="${JAVA_HOME}/bin:${PATH}"
+
+# These are needed for the Clouseau integration
+ENV CLOUSEAU_JAVA_HOME=/opt/java/openjdk8
+COPY --from=ibm-semeru-runtimes:open-8-jre /opt/java/openjdk $CLOUSEAU_JAVA_HOME
+ENV PATH=/usr/local/lib/erlang/bin:"${PATH}"
+
+# Choose whether to install SpiderMonkey 1.8.5, default yes
+ARG js=js
+# Choose whether to install Erlang, default yes
+ARG erlang=erlang
+# Select version of Node, Erlang and Elixir to install
+ARG erlangversion=24.3.4.17
+ARG elixirversion=v1.15.7
+ARG nodeversion=18
+
+# Create Jenkins user and group
+RUN groupadd --gid 910 jenkins; \
+ useradd --uid 910 --gid jenkins --create-home jenkins
+
+# Copy couchdb-ci repo into root's home directory
+ADD --chown=root:root bin /root/couchdb-ci/bin/
+ADD --chown=root:root files /root/couchdb-ci/files/
+
+# Jenkins builds in /usr/src/couchdb.
+RUN mkdir -p /usr/src/couchdb; \
+ chown -R jenkins:jenkins /usr/src/couchdb
+
+# Install all dependencies, and optionally SM 1.8.5
+# This allows us to use the same Dockerfile for building SM
+RUN ERLANGVERSION=$erlangversion \
+ ELIXIRVERSION=$elixirversion \
+ NODEVERSION=$nodeversion \
+ /root/couchdb-ci/bin/install-dependencies.sh $js $erlang
+
+# Allow Jenkins to sudo
+RUN echo "jenkins ALL=(ALL) NOPASSWD: ALL" > /etc/sudoers.d/jenkins
+
+USER jenkins
+
+# overwrite this with 'CMD []' in a dependent Dockerfile
+CMD ["/bin/bash"]
diff --git a/pull-all-couchdbdev-docker b/pull-all-couchdbdev-docker
index 9400813..637d44b 100644
--- a/pull-all-couchdbdev-docker
+++ b/pull-all-couchdbdev-docker
@@ -9,6 +9,7 @@ couchdbci-debian:bullseye-erlang-26.2.5
couchdbci-debian:bullseye-erlang-24.3.4.17
couchdbci-centos:9-erlang-24.3.4.17
couchdbci-centos:8-erlang-24.3.4.17
+couchdbci-ubuntu:noble-erlang-24.3.4.17
couchdbci-ubuntu:jammy-erlang-24.3.4.17
couchdbci-ubuntu:focal-erlang-24.3.4.17
)