This is an automated email from the ASF dual-hosted git repository. jan pushed a commit to branch jenkins-re-add-macos in repository https://gitbox.apache.org/repos/asf/couchdb.git
commit 1a1fea3207428f6f39df36fff41784ee8e32fe56 Author: Jan Lehnardt <[email protected]> AuthorDate: Tue Dec 16 15:39:06 2025 +0100 wip: enable only mac CI --- build-aux/Jenkinsfile | 274 +++++++++++++++++++++++++------------------------- 1 file changed, 137 insertions(+), 137 deletions(-) diff --git a/build-aux/Jenkinsfile b/build-aux/Jenkinsfile index 0563159ce..728a88388 100644 --- a/build-aux/Jenkinsfile +++ b/build-aux/Jenkinsfile @@ -36,55 +36,55 @@ other_changes = "git diff --name-only origin/${env.CHANGE_TARGET} | grep -q -v - // We create parallel build / test / package stages for each OS using the metadata // in this map. Adding a new OS should ideally only involve adding a new entry here. meta = [ - 'centos8': [ - name: 'CentOS 8', - spidermonkey_vsn: '60', - with_nouveau: true, - with_clouseau: false, - clouseau_java_home: '/usr', - quickjs_test262: true, - image: "apache/couchdbci-centos:8-erlang-${ERLANG_VERSION}" - ], - - 'centos9': [ - name: 'CentOS 9', - spidermonkey_vsn: '78', - with_nouveau: true, - with_clouseau: false, - clouseau_java_home: '/usr', - quickjs_test262: true, - image: "apache/couchdbci-centos:9-erlang-${ERLANG_VERSION}" - ], - - 'jammy': [ - name: 'Ubuntu 22.04', - spidermonkey_vsn: '91', - with_nouveau: true, - with_clouseau: false, - clouseau_java_home: '/opt/java/openjdk', - quickjs_test262: true, - image: "apache/couchdbci-ubuntu:jammy-erlang-${ERLANG_VERSION}" - ], - - 'noble': [ - name: 'Ubuntu 24.04', - spidermonkey_vsn: '115', - with_nouveau: true, - with_clouseau: false, - clouseau_java_home: '/opt/java/openjdk', - quickjs_test262: true, - image: "apache/couchdbci-ubuntu:noble-erlang-${ERLANG_VERSION}" - ], - - 'bullseye': [ - name: 'Debian x86_64', - spidermonkey_vsn: '78', - with_nouveau: true, - with_clouseau: false, - clouseau_java_home: '/opt/java/openjdk', - quickjs_test262: true, - image: "apache/couchdbci-debian:bullseye-erlang-${ERLANG_VERSION}" - ], +// 'centos8': [ +// name: 'CentOS 8', +// spidermonkey_vsn: '60', +// with_nouveau: true, +// with_clouseau: false, +// clouseau_java_home: '/usr', +// quickjs_test262: true, +// image: "apache/couchdbci-centos:8-erlang-${ERLANG_VERSION}" +// ], +// +// 'centos9': [ +// name: 'CentOS 9', +// spidermonkey_vsn: '78', +// with_nouveau: true, +// with_clouseau: false, +// clouseau_java_home: '/usr', +// quickjs_test262: true, +// image: "apache/couchdbci-centos:9-erlang-${ERLANG_VERSION}" +// ], +// +// 'jammy': [ +// name: 'Ubuntu 22.04', +// spidermonkey_vsn: '91', +// with_nouveau: true, +// with_clouseau: false, +// clouseau_java_home: '/opt/java/openjdk', +// quickjs_test262: true, +// image: "apache/couchdbci-ubuntu:jammy-erlang-${ERLANG_VERSION}" +// ], +// +// 'noble': [ +// name: 'Ubuntu 24.04', +// spidermonkey_vsn: '115', +// with_nouveau: true, +// with_clouseau: false, +// clouseau_java_home: '/opt/java/openjdk', +// quickjs_test262: true, +// image: "apache/couchdbci-ubuntu:noble-erlang-${ERLANG_VERSION}" +// ], +// +// 'bullseye': [ +// name: 'Debian x86_64', +// spidermonkey_vsn: '78', +// with_nouveau: true, +// with_clouseau: false, +// clouseau_java_home: '/opt/java/openjdk', +// quickjs_test262: true, +// image: "apache/couchdbci-debian:bullseye-erlang-${ERLANG_VERSION}" +// ], // Sometimes we "pick up" ppc64le workers from the asf jenkins intance That // seems like a good thing, however, those workers allow running multiple @@ -119,98 +119,98 @@ meta = [ // node_label: 's390x' // ], - 'base': [ - name: 'Debian x86_64', - spidermonkey_vsn: '78', - with_nouveau: true, - with_clouseau: false, - clouseau_java_home: '/opt/java/openjdk', - // Test this in in the bookworm-quickjs variant - quickjs_test262: false, - image: "${DOCKER_IMAGE_BASE}-${ERLANG_VERSION}" - ], - - 'base-max-erlang': [ - name: 'Debian x86_64', - spidermonkey_vsn: '78', - with_nouveau: true, - with_clouseau: false, - clouseau_java_home: '/opt/java/openjdk', - quickjs_test262: false, - image: "${DOCKER_IMAGE_BASE}-${MAXIMUM_ERLANG_VERSION}" - ], - - 'base-quickjs': [ - name: 'Debian 12 with QuickJS', - disable_spidermonkey: true, - with_nouveau: true, - with_clouseau: false, - clouseau_java_home: '/opt/java/openjdk', - quickjs_test262: true, - image: "${DOCKER_IMAGE_BASE}-${ERLANG_VERSION}" - ], - - // This runs on a docker ARM64 host. Normally we should be able to run all - // ubuntu and centos containers on top any docker host, however spidermonkey - // 60 from CentOS cannot build on ARM64 so we're forced to separate it as a - // separate build usable for ubuntu/debian only and isolated it from other - // builds. At some point when we remove CentOS 8 or switch to QuickJS only, - // remove the docker-arm64 label on ubuntu-nc-arm64-12 node in Jenkins and - // remove this flavor - // - 'base-arm64': [ - name: 'Debian ARM64', - spidermonkey_vsn: '78', - with_nouveau: true, - with_clouseau: false, - clouseau_java_home: '/opt/java/openjdk', - // Test this in in the bookworm-quickjs variant - quickjs_test262: false, - image: "${DOCKER_IMAGE_BASE}-${ERLANG_VERSION}", - node_label: 'docker-arm64' - ], - - 'trixie': [ - name: 'Debian x86_64', - spidermonkey_vsn: '128', - with_nouveau: true, - with_clouseau: false, - clouseau_java_home: '/opt/java/openjdk', - quickjs_test262: true, - image: "apache/couchdbci-debian:trixie-erlang-${ERLANG_VERSION}" - ], - - 'freebsd-x86_64': [ - name: 'FreeBSD x86_64', - spidermonkey_vsn: '91', - with_clouseau: true, - clouseau_java_home: '/usr/local/openjdk21', - quickjs_test262: false, - gnu_make: 'gmake' - ], - - // Spidermonkey 91 has issues on ARM64 FreeBSD - // use QuickJS for now - 'freebsd-arm64': [ - name: 'FreeBSD ARM64 QuickJS', - disable_spidermonkey: true, - with_clouseau: true, - clouseau_java_home: '/usr/local/openjdk21', - quickjs_test262: false, - gnu_make: 'gmake' - ], +// 'base': [ +// name: 'Debian x86_64', +// spidermonkey_vsn: '78', +// with_nouveau: true, +// with_clouseau: false, +// clouseau_java_home: '/opt/java/openjdk', +// // Test this in in the bookworm-quickjs variant +// quickjs_test262: false, +// image: "${DOCKER_IMAGE_BASE}-${ERLANG_VERSION}" +// ], +// +// 'base-max-erlang': [ +// name: 'Debian x86_64', +// spidermonkey_vsn: '78', +// with_nouveau: true, +// with_clouseau: false, +// clouseau_java_home: '/opt/java/openjdk', +// quickjs_test262: false, +// image: "${DOCKER_IMAGE_BASE}-${MAXIMUM_ERLANG_VERSION}" +// ], +// +// 'base-quickjs': [ +// name: 'Debian 12 with QuickJS', +// disable_spidermonkey: true, +// with_nouveau: true, +// with_clouseau: false, +// clouseau_java_home: '/opt/java/openjdk', +// quickjs_test262: true, +// image: "${DOCKER_IMAGE_BASE}-${ERLANG_VERSION}" +// ], +// +// // This runs on a docker ARM64 host. Normally we should be able to run all +// // ubuntu and centos containers on top any docker host, however spidermonkey +// // 60 from CentOS cannot build on ARM64 so we're forced to separate it as a +// // separate build usable for ubuntu/debian only and isolated it from other +// // builds. At some point when we remove CentOS 8 or switch to QuickJS only, +// // remove the docker-arm64 label on ubuntu-nc-arm64-12 node in Jenkins and +// // remove this flavor +// // +// 'base-arm64': [ +// name: 'Debian ARM64', +// spidermonkey_vsn: '78', +// with_nouveau: true, +// with_clouseau: false, +// clouseau_java_home: '/opt/java/openjdk', +// // Test this in in the bookworm-quickjs variant +// quickjs_test262: false, +// image: "${DOCKER_IMAGE_BASE}-${ERLANG_VERSION}", +// node_label: 'docker-arm64' +// ], +// +// 'trixie': [ +// name: 'Debian x86_64', +// spidermonkey_vsn: '128', +// with_nouveau: true, +// with_clouseau: false, +// clouseau_java_home: '/opt/java/openjdk', +// quickjs_test262: true, +// image: "apache/couchdbci-debian:trixie-erlang-${ERLANG_VERSION}" +// ], +// +// 'freebsd-x86_64': [ +// name: 'FreeBSD x86_64', +// spidermonkey_vsn: '91', +// with_clouseau: true, +// clouseau_java_home: '/usr/local/openjdk21', +// quickjs_test262: false, +// gnu_make: 'gmake' +// ], +// +// // Spidermonkey 91 has issues on ARM64 FreeBSD +// // use QuickJS for now +// 'freebsd-arm64': [ +// name: 'FreeBSD ARM64 QuickJS', +// disable_spidermonkey: true, +// with_clouseau: true, +// clouseau_java_home: '/usr/local/openjdk21', +// quickjs_test262: false, +// gnu_make: 'gmake' +// ], // Disable temporarily. Forks / shell execs seem to fail there currently // // - // 'macos': [ - // name: 'macOS', - // spidermonkey_vsn: '128', - // with_nouveau: false, - // with_clouseau: true, - // clouseau_java_home: '/opt/java/openjdk8/zulu-8.jre/Contents/Home', - // gnu_make: 'make' - // ], + 'macos': [ + name: 'macOS', + spidermonkey_vsn: '128', + with_nouveau: false, + with_clouseau: true, + clouseau_java_home: '/opt/java/openjdk8/zulu-8.jre/Contents/Home', + gnu_make: 'make' + ] // Disable temporarily. The behavior we see is that the windows job // locks up and doesn't emit any logs to Jenkins. It just waits for
