You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@couchdb.apache.org by pg...@apache.org on 2025/05/14 02:56:00 UTC
(couchdb) branch jenkins-clouseau-windows-test created (now 5259782fc)
This is an automated email from the ASF dual-hosted git repository.
pgj pushed a change to branch jenkins-clouseau-windows-test
in repository https://gitbox.apache.org/repos/asf/couchdb.git
at 5259782fc Use Erlang cookie string for Clouseau
This branch includes the following new commits:
new 2ea45cea7 Enable Clouseau for the Windows CI
new cdc316b4d delete: Narrow down scope for shorter turnaround
new 837a7717a delete: dump information about HOME
new 5ccf16cd1 Attempt to configure environment for laying down Erlang cookie
new c47917dd5 delete: be more verbose
new e0b72942b dev/run: complete Erlang cookie configuration
new a2f84579b fixup! add Windows support
new 5259782fc Use Erlang cookie string for Clouseau
The 8 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.
(couchdb) 03/08: delete: dump information about HOME
Posted by pg...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
pgj pushed a commit to branch jenkins-clouseau-windows-test
in repository https://gitbox.apache.org/repos/asf/couchdb.git
commit 837a7717abd206908ff8d605ad9a5020a50cc9a2
Author: Gabor Pali <ga...@ibm.com>
AuthorDate: Fri Mar 28 13:35:13 2025 +0100
delete: dump information about HOME
---
build-aux/Jenkinsfile.full | 6 ++++++
1 file changed, 6 insertions(+)
diff --git a/build-aux/Jenkinsfile.full b/build-aux/Jenkinsfile.full
index f602663ca..734fa5a1f 100644
--- a/build-aux/Jenkinsfile.full
+++ b/build-aux/Jenkinsfile.full
@@ -125,6 +125,12 @@ def generateNativeStage(platform) {
"HOMEPATH=${env.HOME}"
]) {
dir( "${platform}/build" ) {
+
+ powershell( script: """
+ .\\..\\..\\couchdb-glazier\\bin\\shell.ps1
+ gci env:* | sort-object name
+ """, label: 'dump environment settings')
+
withClouseau = meta[platform].with_clouseau ? '-WithClouseau' : ''
powershell( script: """
(couchdb) 05/08: delete: be more verbose
Posted by pg...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
pgj pushed a commit to branch jenkins-clouseau-windows-test
in repository https://gitbox.apache.org/repos/asf/couchdb.git
commit c47917dd5a8a286c56a7415bc755b8fe8bdf661c
Author: Gabor Pali <ga...@ibm.com>
AuthorDate: Sat Mar 29 13:40:07 2025 +0100
delete: be more verbose
---
Makefile.win | 2 +-
build-aux/Jenkinsfile.full | 5 +++++
2 files changed, 6 insertions(+), 1 deletion(-)
diff --git a/Makefile.win b/Makefile.win
index 000874b70..b9e0f565d 100644
--- a/Makefile.win
+++ b/Makefile.win
@@ -257,7 +257,7 @@ endif
elixir-search: export MIX_ENV=integration
elixir-search: elixir-init devclean
ifneq ($(_WITH_CLOUSEAU), )
- @dev\run -n 1 -q -a adm:pass \
+ @dev\run -n 1 -a adm:pass \
"$(_WITH_CLOUSEAU)" \
"$(TEST_OPTS)" \
--locald-config test/config/test-config.ini \
diff --git a/build-aux/Jenkinsfile.full b/build-aux/Jenkinsfile.full
index 728d74265..cfb02e959 100644
--- a/build-aux/Jenkinsfile.full
+++ b/build-aux/Jenkinsfile.full
@@ -177,6 +177,11 @@ def generateNativeStage(platform) {
catch (err) {
powershell( script: "Get-ChildItem ${WORKSPACE}")
dir( "${platform}/build" ) {
+ powershell( script: """
+ .\\..\\..\\couchdb-glazier\\bin\\shell.ps1
+ cat dev/logs/*.log
+ """, label: 'Dump logs')
+
powershell( script: '.\\..\\..\\couchdb-glazier\\bin\\shell.ps1; make -f Makefile.win build-report')
powershell( script: 'Get-Content test-results.log')
}
(couchdb) 07/08: fixup! add Windows support
Posted by pg...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
pgj pushed a commit to branch jenkins-clouseau-windows-test
in repository https://gitbox.apache.org/repos/asf/couchdb.git
commit a2f84579b58eb0716c3df5b325bcefd73798e83a
Author: Gabor Pali <ga...@ibm.com>
AuthorDate: Sun May 4 18:53:20 2025 +0200
fixup! add Windows support
---
Makefile.win | 4 ++++
1 file changed, 4 insertions(+)
diff --git a/Makefile.win b/Makefile.win
index b9e0f565d..6d2aa83e0 100644
--- a/Makefile.win
+++ b/Makefile.win
@@ -93,6 +93,10 @@ EXUNIT_OPTS=$(subst $(comma),$(space),$(tests))
TEST_OPTS="-c startup_jitter=0 -c default_security=admin_local -c iterations=9"
+ifneq ($(ERLANG_COOKIE),)
+TEST_OPTS+=" --erlang-cookie=$(ERLANG_COOKIE)"
+endif
+
################################################################################
# Main commands
################################################################################
(couchdb) 06/08: dev/run: complete Erlang cookie configuration
Posted by pg...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
pgj pushed a commit to branch jenkins-clouseau-windows-test
in repository https://gitbox.apache.org/repos/asf/couchdb.git
commit e0b72942bdbe937725948c08624e5d5499ed98fd
Author: Gabor Pali <ga...@ibm.com>
AuthorDate: Sun May 4 18:00:02 2025 +0200
dev/run: complete Erlang cookie configuration
The `--erlang-cookie` configuration flag for the `dev/run` script
does not propagate the cookie value for `vm.args` so that the
nodes will not have it configured on starting up. That is why,
for example, pinging the Clouseau nodes with user-provided cookie
will not work, as well as Clouseau nodes will not be able to
connect even though they picked up the right value already.
Add the missing parts to tweak `vm.args` accordingly and make the
Erlang cookie configurable through the `Makefile` too.
---
Makefile | 4 ++++
dev/run | 23 +++++++++++++++--------
2 files changed, 19 insertions(+), 8 deletions(-)
diff --git a/Makefile b/Makefile
index 8b1df51e6..fdab740a0 100644
--- a/Makefile
+++ b/Makefile
@@ -95,6 +95,10 @@ EXUNIT_OPTS=$(subst $(comma),$(space),$(tests))
TEST_OPTS="-c 'startup_jitter=0' -c 'default_security=admin_local' -c 'iterations=9'"
+ifneq ($(ERLANG_COOKIE),)
+TEST_OPTS+=" --erlang-cookie=$(ERLANG_COOKIE)"
+endif
+
################################################################################
# Main commands
################################################################################
diff --git a/dev/run b/dev/run
index 85ea9622d..478fb2ae9 100755
--- a/dev/run
+++ b/dev/run
@@ -515,7 +515,7 @@ def write_config(ctx, node, env):
content = apply_config_overrides(ctx, content)
elif base == "local.ini":
content = hack_local_ini(ctx, content)
- elif ctx["enable_tls"] and base == "vm.args":
+ elif base == "vm.args":
content = hack_vm_args(ctx, node, content)
with open(tgt, "w") as handle:
@@ -839,16 +839,23 @@ def hack_local_ini(ctx, contents):
def hack_vm_args(ctx, node, contents):
- contents += f"""
+ if ctx["enable_tls"]:
+ contents += f"""
-proto_dist couch
-couch_dist no_tls '"clouseau{node[-1]}@127.0.0.1"'
-ssl_dist_optfile {ctx["rootdir"]}/src/couch_dist/certs/out/couch_dist.conf
- """
- if ctx["no_tls"]:
- no_tls_nodes = ctx["no_tls"].split(",")
- for node_name in no_tls_nodes:
- node_name = node_name if "@" in node_name else f"{node_name}@127.0.0.1"
- contents += f"""\n-couch_dist no_tls '"{node_name}"'"""
+"""
+ if ctx["no_tls"]:
+ no_tls_nodes = ctx["no_tls"].split(",")
+ for node_name in no_tls_nodes:
+ node_name = node_name if "@" in node_name else f"{node_name}@127.0.0.1"
+ contents += f"""
+-couch_dist no_tls '"{node_name}"'
+"""
+ if ctx["erlang_cookie"]:
+ contents += f"""
+-setcookie {ctx["erlang_cookie"]}
+"""
return contents
(couchdb) 02/08: delete: Narrow down scope for shorter turnaround
Posted by pg...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
pgj pushed a commit to branch jenkins-clouseau-windows-test
in repository https://gitbox.apache.org/repos/asf/couchdb.git
commit cdc316b4df70eb84e1cc7772a3e33790cd299582
Author: Gabor Pali <ga...@ibm.com>
AuthorDate: Tue Mar 25 20:44:19 2025 +0100
delete: Narrow down scope for shorter turnaround
---
build-aux/Jenkinsfile.full | 108 ---------------------------------------------
1 file changed, 108 deletions(-)
diff --git a/build-aux/Jenkinsfile.full b/build-aux/Jenkinsfile.full
index 026efd5d2..f602663ca 100644
--- a/build-aux/Jenkinsfile.full
+++ b/build-aux/Jenkinsfile.full
@@ -23,114 +23,6 @@ MINIMUM_ERLANG_VERSION = '25.3.2.20'
// 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: true,
- image: "apache/couchdbci-centos:8-erlang-${ERLANG_VERSION}"
- ],
-
- 'centos9': [
- name: 'CentOS 9',
- spidermonkey_vsn: '78',
- with_nouveau: true,
- with_clouseau: true,
- image: "apache/couchdbci-centos:9-erlang-${ERLANG_VERSION}"
- ],
-
- 'focal': [
- name: 'Ubuntu 20.04',
- spidermonkey_vsn: '68',
- with_nouveau: true,
- with_clouseau: true,
- image: "apache/couchdbci-ubuntu:focal-erlang-${ERLANG_VERSION}"
- ],
-
- 'jammy': [
- name: 'Ubuntu 22.04',
- spidermonkey_vsn: '91',
- with_nouveau: true,
- with_clouseau: true,
- image: "apache/couchdbci-ubuntu:jammy-erlang-${ERLANG_VERSION}"
- ],
-
- 'noble': [
- name: 'Ubuntu 24.04',
- spidermonkey_vsn: '115',
- with_nouveau: true,
- with_clouseau: true,
- image: "apache/couchdbci-ubuntu:noble-erlang-${ERLANG_VERSION}"
- ],
-
- 'bookworm-ppc64': [
- name: 'Debian POWER',
- spidermonkey_vsn: '78',
- with_nouveau: true,
- with_clouseau: true,
- image: "apache/couchdbci-debian:bookworm-erlang-${ERLANG_VERSION}",
- node_label: 'ppc64le'
- ],
-
- 'bookworm-s390x': [
- name: 'Debian s390x',
- spidermonkey_vsn: '78',
- with_nouveau: true,
- image: "apache/couchdbci-debian:bookworm-erlang-${ERLANG_VERSION}",
- node_label: 's390x'
- ],
-
- 'bullseye': [
- name: 'Debian x86_64',
- spidermonkey_vsn: '78',
- with_nouveau: true,
- with_clouseau: true,
- image: "apache/couchdbci-debian:bullseye-erlang-${ERLANG_VERSION}"
- ],
-
- 'bookworm': [
- name: 'Debian x86_64',
- spidermonkey_vsn: '78',
- with_nouveau: true,
- with_clouseau: true,
- image: "apache/couchdbci-debian:bookworm-erlang-${ERLANG_VERSION}"
- ],
-
- 'bookworm-quickjs': [
- name: 'Debian 12 with QuickJS',
- disable_spidermonkey: true,
- with_nouveau: true,
- with_clouseau: true,
- image: "apache/couchdbci-debian:bookworm-erlang-${ERLANG_VERSION}"
- ],
-
- 'freebsd-x86_64': [
- name: 'FreeBSD x86_64',
- spidermonkey_vsn: '91',
- with_clouseau: true,
- clouseau_java_home: '/usr/local/openjdk8-jre',
- 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/openjdk8-jre',
- gnu_make: 'gmake'
- ],
-
- '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'
- ],
-
'win2022': [
name: 'Windows 2022',
spidermonkey_vsn: '128',
(couchdb) 04/08: Attempt to configure environment for laying down Erlang cookie
Posted by pg...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
pgj pushed a commit to branch jenkins-clouseau-windows-test
in repository https://gitbox.apache.org/repos/asf/couchdb.git
commit 5ccf16cd16132c6329ebcb4d4c79e2f2d66a8ea2
Author: Gabor Pali <ga...@ibm.com>
AuthorDate: Fri Mar 28 15:51:48 2025 +0100
Attempt to configure environment for laying down Erlang cookie
---
build-aux/Jenkinsfile.full | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/build-aux/Jenkinsfile.full b/build-aux/Jenkinsfile.full
index 734fa5a1f..728d74265 100644
--- a/build-aux/Jenkinsfile.full
+++ b/build-aux/Jenkinsfile.full
@@ -122,7 +122,8 @@ def generateNativeStage(platform) {
powershell( script: "New-Item -ItemType Directory -Path '${platform}/build' -Force", label: 'Create build directories' )
powershell( script: "tar -xf (Get-Item apache-couchdb-*.tar.gz) -C '${platform}/build' --strip-components=1", label: 'Unpack release' )
withEnv([
- "HOMEPATH=${env.HOME}"
+ "HOMEPATH=${env.LOCALAPPDATA}",
+ "HOME=${env.LOCALAPPDATA}"
]) {
dir( "${platform}/build" ) {
(couchdb) 01/08: Enable Clouseau for the Windows CI
Posted by pg...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
pgj pushed a commit to branch jenkins-clouseau-windows-test
in repository https://gitbox.apache.org/repos/asf/couchdb.git
commit 2ea45cea7a5236bcdf5306a5bcbcfa3aed140271
Author: Gabor Pali <ga...@ibm.com>
AuthorDate: Tue Mar 25 20:35:38 2025 +0100
Enable Clouseau for the Windows CI
Implement the `with_clouseau` flag for the Windows worker and make
other adjustments to unblock running `erl_call` for pinging the
Clouseau nodes. The `elixir-search` target could be safely run
unconditionally, the `Makefile` is going to skip the tests when
Clouseau is not present.
---
build-aux/Jenkinsfile.full | 65 +++++++++++++++++++++++++++-------------------
1 file changed, 38 insertions(+), 27 deletions(-)
diff --git a/build-aux/Jenkinsfile.full b/build-aux/Jenkinsfile.full
index 479aec7ea..026efd5d2 100644
--- a/build-aux/Jenkinsfile.full
+++ b/build-aux/Jenkinsfile.full
@@ -134,6 +134,7 @@ meta = [
'win2022': [
name: 'Windows 2022',
spidermonkey_vsn: '128',
+ with_clouseau: true,
node_label: 'win'
]
]
@@ -228,33 +229,43 @@ def generateNativeStage(platform) {
powershell( script: "git clone https://github.com/apache/couchdb-glazier", label: 'Cloning couchdb-glazier repository' )
powershell( script: "New-Item -ItemType Directory -Path '${platform}/build' -Force", label: 'Create build directories' )
powershell( script: "tar -xf (Get-Item apache-couchdb-*.tar.gz) -C '${platform}/build' --strip-components=1", label: 'Unpack release' )
- dir( "${platform}/build" ) {
- powershell( script: """
- .\\..\\..\\couchdb-glazier\\bin\\shell.ps1
- .\\configure.ps1 -SkipDeps -WithNouveau -SpiderMonkeyVersion ${meta[platform].spidermonkey_vsn}
- Set-Item -Path env:GRADLE_OPTS -Value '-Dorg.gradle.daemon=false'
- make -f Makefile.win release
- """, label: 'Configure and Build')
-
- //powershell( script: ".\\..\\..\\couchdb-glazier\\bin\\shell.ps1; make -f Makefile.win eunit", label: 'EUnit tests')
- //powershell( script: ".\\..\\..\\couchdb-glazier\\bin\\shell.ps1; make -f Makefile.win elixir", label: 'Elixir tests')
-
- powershell( script: '& .\\..\\..\\couchdb-glazier\\bin\\shell.ps1; Write-Host "NOT AVAILABLE: make -f Makefile.win elixir-search"', label: 'N/A Clouseau tests')
-
- powershell( script: """
- .\\..\\..\\couchdb-glazier\\bin\\shell.ps1
- Set-Item -Path env:GRADLE_OPTS -Value '-Dorg.gradle.daemon=false'
- make -f Makefile.win mango-test
- """, label: 'Mango tests')
-
- powershell( script: '.\\..\\..\\couchdb-glazier\\bin\\shell.ps1; Write-Host "NOT AVAILABLE: make -f Makefile.win weatherreport-test"', label: 'N/A Weatherreport tests')
-
- // temporary exclude - random flaky tests on Windows
- //powershell( script: """
- // .\\..\\..\\couchdb-glazier\\bin\\shell.ps1
- // Set-Item -Path env:GRADLE_OPTS -Value '-Dorg.gradle.daemon=false'
- // make -f Makefile.win nouveau-test
- //""", label: 'Nouveau tests')
+ withEnv([
+ "HOMEPATH=${env.HOME}"
+ ]) {
+ dir( "${platform}/build" ) {
+ withClouseau = meta[platform].with_clouseau ? '-WithClouseau' : ''
+
+ powershell( script: """
+ .\\..\\..\\couchdb-glazier\\bin\\shell.ps1
+ .\\configure.ps1 -SkipDeps -WithNouveau ${withClouseau} -SpiderMonkeyVersion ${meta[platform].spidermonkey_vsn}
+ Set-Item -Path env:GRADLE_OPTS -Value '-Dorg.gradle.daemon=false'
+ make -f Makefile.win release
+ """, label: 'Configure and Build')
+
+ //powershell( script: ".\\..\\..\\couchdb-glazier\\bin\\shell.ps1; make -f Makefile.win eunit", label: 'EUnit tests')
+ //powershell( script: ".\\..\\..\\couchdb-glazier\\bin\\shell.ps1; make -f Makefile.win elixir", label: 'Elixir tests')
+
+ powershell( script: """
+ .\\..\\..\\couchdb-glazier\\bin\\shell.ps1
+ Set-Item -Path env:GRADLE_OPTS -Value '-Dorg.gradle.daemon=false'
+ make -f Makefile.win elixir-search
+ """, label: 'Clouseau tests')
+
+ powershell( script: """
+ .\\..\\..\\couchdb-glazier\\bin\\shell.ps1
+ Set-Item -Path env:GRADLE_OPTS -Value '-Dorg.gradle.daemon=false'
+ make -f Makefile.win mango-test
+ """, label: 'Mango tests')
+
+ powershell( script: '.\\..\\..\\couchdb-glazier\\bin\\shell.ps1; Write-Host "NOT AVAILABLE: make -f Makefile.win weatherreport-test"', label: 'N/A Weatherreport tests')
+
+ // temporary exclude - random flaky tests on Windows
+ //powershell( script: """
+ // .\\..\\..\\couchdb-glazier\\bin\\shell.ps1
+ // Set-Item -Path env:GRADLE_OPTS -Value '-Dorg.gradle.daemon=false'
+ // make -f Makefile.win nouveau-test
+ //""", label: 'Nouveau tests')
+ }
}
powershell( script: """
(couchdb) 08/08: Use Erlang cookie string for Clouseau
Posted by pg...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
pgj pushed a commit to branch jenkins-clouseau-windows-test
in repository https://gitbox.apache.org/repos/asf/couchdb.git
commit 5259782fcc7da76837b16a7ae36fff86d401b813
Author: Gabor Pali <ga...@ibm.com>
AuthorDate: Sun May 4 19:02:14 2025 +0200
Use Erlang cookie string for Clouseau
---
build-aux/Jenkinsfile.full | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/build-aux/Jenkinsfile.full b/build-aux/Jenkinsfile.full
index cfb02e959..67dd03d21 100644
--- a/build-aux/Jenkinsfile.full
+++ b/build-aux/Jenkinsfile.full
@@ -147,13 +147,13 @@ def generateNativeStage(platform) {
powershell( script: """
.\\..\\..\\couchdb-glazier\\bin\\shell.ps1
Set-Item -Path env:GRADLE_OPTS -Value '-Dorg.gradle.daemon=false'
- make -f Makefile.win elixir-search
+ make -f Makefile.win elixir-search ERLANG_COOKIE=crumbles
""", label: 'Clouseau tests')
powershell( script: """
.\\..\\..\\couchdb-glazier\\bin\\shell.ps1
Set-Item -Path env:GRADLE_OPTS -Value '-Dorg.gradle.daemon=false'
- make -f Makefile.win mango-test
+ make -f Makefile.win mango-test ERLANG_COOKIE=crumbles
""", label: 'Mango tests')
powershell( script: '.\\..\\..\\couchdb-glazier\\bin\\shell.ps1; Write-Host "NOT AVAILABLE: make -f Makefile.win weatherreport-test"', label: 'N/A Weatherreport tests')