Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Hide journal recovery messages during test suite run #5469

Merged

Conversation

adamretter
Copy link
Contributor

Stops the CI logs from getting polluted

@adamretter adamretter added the ci issues related to continuous integration label Oct 2, 2024
@adamretter adamretter added this to the eXist-7.0.0 milestone Oct 2, 2024
@adamretter adamretter requested a review from a team as a code owner October 2, 2024 20:02
Copy link
Member

@dizzzz dizzzz left a comment

Choose a reason for hiding this comment

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

It looks like the PR contains content of another PR?

Copy link
Member

@reinhapa reinhapa left a comment

Choose a reason for hiding this comment

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

Great enhancement to have less output during tests!

.github/workflows/ci-deploy.yml Outdated Show resolved Hide resolved
.github/workflows/ci-test.yml Outdated Show resolved Hide resolved
.github/workflows/ci-test.yml Outdated Show resolved Hide resolved
.github/workflows/ci-test.yml Outdated Show resolved Hide resolved
.github/workflows/ci-xqts.yml Outdated Show resolved Hide resolved
.github/workflows/sonarcloud.yml Outdated Show resolved Hide resolved
@adamretter
Copy link
Contributor Author

adamretter commented Oct 3, 2024

@dizzzz @reinhapa I kept the journal improvements and CI improvements in a single PR, as that is what I had already done for 4.x.x, 5.x.x, and 6.x.x; albeit in those cases I needed to do both in a single PR to be able to see what was going on. I kept these things as separate commits at least. If you feel this PR here must be split into two - let me know and I will do so...

@adamretter adamretter force-pushed the hotfix/ci-hide-journal-recovery branch from 69a6c23 to 49fdba7 Compare October 3, 2024 10:25
@dizzzz
Copy link
Member

dizzzz commented Oct 3, 2024

It is OK for me, as it is intentional

@duncdrum
Copy link
Contributor

duncdrum commented Oct 4, 2024

I m also curious what the JDK has to do with it. Since we use temurin not just on CI here, but also in Docker and all other repos in the org, I m not a fan of changing it without reason. If there is a reason to change, we should stay consistent elsewhere in the org.

@reinhapa
Copy link
Member

reinhapa commented Oct 4, 2024

I'm ok changing the JDK for the sake of having the old versions, but on the develop branch I would prefer to leave it using the temurin one...

@dizzzz
Copy link
Member

dizzzz commented Oct 5, 2024

It looks like that switching to the JVM Adam suggested all kind of strange test/fork/... issues occur.

Looking at the discussions it is probably better to split the jvm change and the recovery log code delta.

@reinhapa
Copy link
Member

reinhapa commented Oct 6, 2024

It looks like that switching to the JVM Adam suggested all kind of strange test/fork/... issues occur.

Looking at the discussions it is probably better to split the jvm change and the recovery log code delta.

We then at least can rule out side effects from the JDK change... Just to be clear I'm full in the hiding suff!

Copy link
Member

@line-o line-o left a comment

Choose a reason for hiding this comment

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

I do appreciate hiding the journal progress bar in CI!
I would like to see as @dizzz and @reinhapa that only the changes necessary for that to work would be included in this PR.
I would also like to see them in just one or two commits.

@adamretter
Copy link
Contributor Author

I m also curious what the JDK has to do with it.

@duncdrum (cc @reinhapa) As I wrote before you posted, see: "as that is what I had already done for 4.x.x, 5.x.x, and 6.x.x"

Since we use temurin not just on CI here, but also in Docker and all other repos in the org, I m not a fan of changing it without reason.

@duncdrum We are now using Liberica (and not Temurin) for eXist-db 4.x.x, 5.x.x, and 6.x.x. I am also a fan of consistency and so I wanted to use Liberica also for 7.x.x in THIS repo.
Regards Docker, I think you may be mistaken, we are not using Temurin and we never have:

  1. For eXist-db 7.x.x in Docker we are using OpenJDK (from gcr.io/distroless/java17:latest base image), see: https://github.com/GoogleContainerTools/distroless/blob/main/java/README.md
  2. For eXist-db 6.x.x in Docker we are using OpenJDK, see: https://github.com/eXist-db/exist/blob/develop-6.x.x/exist-docker/src/main/resources-filtered/Dockerfile#L28
  3. For eXist-db 5.x.x in Docker we are using OpenJDK, see: https://github.com/eXist-db/exist/blob/develop-5.x.x/exist-docker/src/main/resources-filtered/Dockerfile#L28
  4. For eXist-db 4.x.x in Docker we are using OpenJDK, see: https://github.com/eXist-db/docker-existdb/blob/master/Dockerfile#L28

If there is a reason to change

Yes, the features of eXist-db 4.x.x, 5.x.x, and 6.x.x only reliably run 100% on Java 8. Whilst you can run some parts of eXist-db 4.x.x, 5.x.x, and 6.x.x on newer Java, you will find various parts that throw exceptions due to changes in the JDK after Java 8; JAXB, Mail, Activation, Image, etc.

There does not appear to be a Temurin build available for Java 8 in macOS (at least in CI) so we simply can't use Temurin in CI, however there is one for Liberica. That is the reason for the change.

I see a reason to drop Temurin, but no reason not to use Liberica (which is also based on OpenJDK).

we should stay consistent elsewhere in the org.

I am not so concerned about other repos in this org as they each have different requirements that I expect to be set by the owners of those repos.

As the JDK change seems to be of concern, I will move it to a separate PR. However I think that we should choose one JDK vendor across 4.x.x, 5.x.x, 6.x.x, and 7.x.x and stick to it in this repo. As Temurin won't work for us (no JDK 8 support on macOS in CI) we need to choose one of the others.

@adamretter adamretter force-pushed the hotfix/ci-hide-journal-recovery branch from 49fdba7 to bfa724e Compare October 8, 2024 18:56
@adamretter
Copy link
Contributor Author

@dizzzz @reinhapa I have moved JDK change out of this PR and into a new PR - #5480

Copy link

sonarcloud bot commented Oct 8, 2024

Quality Gate Failed Quality Gate failed

Failed conditions
68.6% Coverage on New Code (required ≥ 80%)
B Reliability Rating on New Code (required ≥ A)

See analysis details on SonarCloud

Catch issues before they fail your Quality Gate with our IDE extension SonarLint

@dizzzz dizzzz requested a review from line-o October 8, 2024 20:29
@dizzzz dizzzz merged commit 48043bb into eXist-db:develop Oct 10, 2024
12 of 13 checks passed
@adamretter adamretter deleted the hotfix/ci-hide-journal-recovery branch November 28, 2024 15:25
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
ci issues related to continuous integration
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants