From 678c71b61030d288865b387c1039cd61a0bc1c91 Mon Sep 17 00:00:00 2001 From: Tamas Cservenak Date: Mon, 31 Mar 2025 19:20:03 +0200 Subject: [PATCH 1/3] [CI] Disable Mimir JGroups node We do not utilize LAN sharing on CI, caches are "local" only. Also, as can be seen, Jgroups may fail to start on Windoze. --- .github/ci-mimir-daemon.properties | 4 ++++ .github/workflows/maven.yml | 3 +++ 2 files changed, 7 insertions(+) create mode 100644 .github/ci-mimir-daemon.properties diff --git a/.github/ci-mimir-daemon.properties b/.github/ci-mimir-daemon.properties new file mode 100644 index 000000000000..0aa337b3e569 --- /dev/null +++ b/.github/ci-mimir-daemon.properties @@ -0,0 +1,4 @@ +# Mimir Daemon properties + +# Disable JGroups; we don't want/use LAN cache sharing +mimir.jgroups.enabled=false \ No newline at end of file diff --git a/.github/workflows/maven.yml b/.github/workflows/maven.yml index 83681df2fbcf..704965ad8daa 100644 --- a/.github/workflows/maven.yml +++ b/.github/workflows/maven.yml @@ -46,6 +46,7 @@ jobs: run: | mkdir -p ~/.m2 cp .github/ci-extensions.xml ~/.m2/extensions.xml + cp .github/ci-mimir-daemon.properties ~/.mimir/daemon.properties - name: Handle Mimir caches uses: actions/cache@v4 @@ -113,6 +114,7 @@ jobs: run: | mkdir -p ~/.m2 cp .github/ci-extensions.xml ~/.m2/extensions.xml + cp .github/ci-mimir-daemon.properties ~/.mimir/daemon.properties - name: Handle Mimir caches uses: actions/cache@v4 @@ -194,6 +196,7 @@ jobs: run: | mkdir -p ~/.m2 cp .github/ci-extensions.xml ~/.m2/extensions.xml + cp .github/ci-mimir-daemon.properties ~/.mimir/daemon.properties - name: Handle Mimir caches uses: actions/cache@v4 From fa0221d31c38e78089843af52270dd96eac7291a Mon Sep 17 00:00:00 2001 From: Tamas Cservenak Date: Mon, 31 Mar 2025 19:22:04 +0200 Subject: [PATCH 2/3] Create mimir base directory --- .github/workflows/maven.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.github/workflows/maven.yml b/.github/workflows/maven.yml index 704965ad8daa..56f2386a4de7 100644 --- a/.github/workflows/maven.yml +++ b/.github/workflows/maven.yml @@ -45,6 +45,7 @@ jobs: shell: bash run: | mkdir -p ~/.m2 + mkdir -p ~/.mimir cp .github/ci-extensions.xml ~/.m2/extensions.xml cp .github/ci-mimir-daemon.properties ~/.mimir/daemon.properties @@ -113,6 +114,7 @@ jobs: shell: bash run: | mkdir -p ~/.m2 + mkdir -p ~/.mimir cp .github/ci-extensions.xml ~/.m2/extensions.xml cp .github/ci-mimir-daemon.properties ~/.mimir/daemon.properties @@ -195,6 +197,7 @@ jobs: shell: bash run: | mkdir -p ~/.m2 + mkdir -p ~/.mimir cp .github/ci-extensions.xml ~/.m2/extensions.xml cp .github/ci-mimir-daemon.properties ~/.mimir/daemon.properties From 74958550dcef2c3ba2afdb572cfe3f60153535f3 Mon Sep 17 00:00:00 2001 From: Tamas Cservenak Date: Mon, 31 Mar 2025 19:24:08 +0200 Subject: [PATCH 3/3] Add header, sigh --- .github/ci-mimir-daemon.properties | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/.github/ci-mimir-daemon.properties b/.github/ci-mimir-daemon.properties index 0aa337b3e569..86a84b6ac58d 100644 --- a/.github/ci-mimir-daemon.properties +++ b/.github/ci-mimir-daemon.properties @@ -1,3 +1,20 @@ +# +# 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 under the License. +# + # Mimir Daemon properties # Disable JGroups; we don't want/use LAN cache sharing