Skip to content

Conversation

@pgj
Copy link
Contributor

@pgj pgj commented Nov 6, 2023

This change makes it possible to run tests that require the Search functionality to be configured. Therefore the test coverage could be increased and issues could be caught with the related applications, such as Dreyfus and the text searches in Mango.

@pgj pgj force-pushed the feat/add-clouseau branch from e6a9505 to 78472df Compare November 6, 2023 01:20
@pgj pgj force-pushed the feat/add-clouseau branch from 78472df to 22b97ef Compare November 6, 2023 20:35
Copy link
Contributor

@big-r81 big-r81 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

+1 from me.

Would like to get at least a second pair of eyes. cc @nickva @rnewson

@pgj
Copy link
Contributor Author

pgj commented Nov 8, 2023

Thanks @big-r81 . I will not merge it for now — I have a new approach in mind but that would require changes to the CouchDB code base (the dev/run script itself). I will open a PR about it soon and update this PR according to that one.

@pgj pgj marked this pull request as draft November 8, 2023 12:39
@pgj pgj force-pushed the feat/add-clouseau branch 2 times, most recently from 53c70bc to f606b62 Compare November 10, 2023 20:08
@pgj pgj changed the title feat: add Clouseau to the Docker images feat: add JDK 8 to the Docker images for running Clouseau Nov 10, 2023
@pgj
Copy link
Contributor Author

pgj commented Nov 10, 2023

With the help of eclipse-temurin the change has become much smaller and it works for all the currently supported platforms.

@pgj pgj marked this pull request as ready for review November 10, 2023 21:04
@rnewson
Copy link
Member

rnewson commented Nov 10, 2023

I thought the version of scala we need was incompatible with JDK 8, at least at compile time?

@pgj
Copy link
Contributor Author

pgj commented Nov 11, 2023

Yes, you are right. The compilation of Clouseau does not work with JDK 8. But the created JARs could be run with that version, I have tested it on multiple platforms.

@pgj pgj force-pushed the feat/add-clouseau branch from f606b62 to c37a106 Compare November 11, 2023 02:35
@pgj pgj changed the title feat: add JDK 8 to the Docker images for running Clouseau feat: add Java 8 to the Docker images for running Clouseau Nov 11, 2023
@pgj pgj force-pushed the feat/add-clouseau branch from c37a106 to d0b631c Compare November 16, 2023 16:16
@pgj
Copy link
Contributor Author

pgj commented Nov 16, 2023

I have extended changes to Debian Bookworm and it was confirmed to be working.

@nickva
Copy link
Contributor

nickva commented Nov 16, 2023

I noticed a failure on s390x architecture:

 => [linux/amd64 internal] load metadata for docker.io/library/eclipse-temurin:11                                                                                                       0.2s
------
 > [linux/s390x internal] load metadata for docker.io/library/eclipse-temurin:8-jre:
------
debian-bullseye:31
--------------------
  29 |     # These are needed for the Clouseau integration
  30 |     ENV CLOUSEAU_JAVA_HOME=/opt/java/openjdk8
  31 | >>> COPY --from=eclipse-temurin:8-jre /opt/java/openjdk $CLOUSEAU_JAVA_HOME
  32 |     ENV PATH=/usr/local/lib/erlang/bin:"${PATH}"
  33 |     
--------------------
ERROR: failed to solve: eclipse-temurin:8-jre: no match for platform in manifest sha256:c45278155f132fdd260786ec455e7de9062976536896a9eee422cd2e500a1edc: not found

This change makes it possible to run tests that require the Search
functionality to be configured.  Therefore the test coverage could
be increased and issues could be caught with the related
applications, such as Dreyfus and the `text` searches in Mango.
@pgj pgj force-pushed the feat/add-clouseau branch from d0b631c to eed45a7 Compare November 16, 2023 20:50
@pgj
Copy link
Contributor Author

pgj commented Nov 16, 2023

I replaced eclipse-temurin:8-jre for ibm-semeru-runtimes:open-8-jre which has support for s390x. I could test it for linux/arm64 (with Debian Bookworm) and it worked for me.

@nickva
Copy link
Contributor

nickva commented Nov 16, 2023

@pgj good find! This image works so far. I am building/uploading bullseye. Once bullseye finishes I will merge the PR.

Copy link
Contributor

@nickva nickva left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

+1 building worked on bullseye on all supported architectures

$ ERLANGVERSION=24.3.4.14 ./build.sh buildx-platform debian-bullseye

 pushing manifest for docker.io/apache/couchdbci-debian:bullseye-erlang-24.3.4.14@sha256:a6b60ddc9d9ee8fcb8c9a76b22cfe5d7e64a0b88e0dbc32f2027f3fe65dcaa6e

@nickva nickva merged commit 2bfc0ab into apache:main Nov 16, 2023
@pgj pgj deleted the feat/add-clouseau branch November 17, 2023 12:36
@pgj
Copy link
Contributor Author

pgj commented Nov 17, 2023

Excellent. Thanks @nickva !

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants