Skip to content

Commit 47a6550

Browse files
Add Eclipse P2 mirror to avoid download.eclipse.org outages (neural-search) (#1940) (#1945)
* Add Eclipse P2 mirror to avoid download.eclipse.org outages * Fix indentation in CI.yml integMultiNodeTest job --------- (cherry picked from commit f4e975e) Signed-off-by: Peter Zhu <zhujiaxi@amazon.com> Signed-off-by: opensearch-ci-bot <opensearch-infra@amazon.com> Co-authored-by: Peter Zhu <zhujiaxi@amazon.com>
1 parent fc733c8 commit 47a6550

2 files changed

Lines changed: 25 additions & 20 deletions

File tree

.github/workflows/CI.yml

Lines changed: 24 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@ jobs:
2424
Check-neural-search-linux:
2525
needs: Get-CI-Image-Tag
2626
strategy:
27+
fail-fast: false
2728
matrix:
2829
java: [21, 25]
2930
os: [ubuntu-latest]
@@ -69,6 +70,7 @@ jobs:
6970

7071
Check-neural-search-windows:
7172
strategy:
73+
fail-fast: false
7274
matrix:
7375
java: [21, 25]
7476
os: [windows-latest]
@@ -93,6 +95,7 @@ jobs:
9395
Precommit-neural-search-linux:
9496
needs: Get-CI-Image-Tag
9597
strategy:
98+
fail-fast: false
9699
matrix:
97100
java: [21, 25]
98101
os: [ubuntu-latest]
@@ -127,6 +130,7 @@ jobs:
127130
integTest:
128131
needs: Precommit-neural-search-linux
129132
strategy:
133+
fail-fast: false
130134
matrix:
131135
java: [ 21, 25 ]
132136
os: [ ubuntu-latest ]
@@ -145,22 +149,23 @@ jobs:
145149
./gradlew integTest --parallel
146150
147151
integMultiNodeTest:
148-
needs: Precommit-neural-search-linux
149-
strategy:
150-
matrix:
151-
java: [ 21 ]
152-
os: [ ubuntu-latest ]
153-
configureNodeRoles: [ false, true ]
154-
name: Multi-Node Integ Test JDK${{ matrix.java }}, With Role Assignment ${{ matrix.configureNodeRoles }}
155-
runs-on: ${{ matrix.os }}
156-
steps:
157-
- uses: actions/checkout@34e114876b0b11c390a56381ad16ebd13914f8d5 # v4
158-
- name: Set up JDK ${{ matrix.java }}
159-
uses: actions/setup-java@c1e323688fd81a25caa38c78aa6df2d33d3e20d9 # v4
160-
with:
161-
java-version: ${{ matrix.java }}
162-
distribution: temurin
163-
cache: 'gradle'
164-
- name: Build and Run Tests
165-
run: |
166-
./gradlew integTest --parallel -PnumNodes=3 -PconfigureNodeRoles=${{ matrix.configureNodeRoles }}
152+
needs: Precommit-neural-search-linux
153+
strategy:
154+
fail-fast: false
155+
matrix:
156+
java: [ 21 ]
157+
os: [ ubuntu-latest ]
158+
configureNodeRoles: [ false, true ]
159+
name: Multi-Node Integ Test JDK${{ matrix.java }}, With Role Assignment ${{ matrix.configureNodeRoles }}
160+
runs-on: ${{ matrix.os }}
161+
steps:
162+
- uses: actions/checkout@34e114876b0b11c390a56381ad16ebd13914f8d5 # v4
163+
- name: Set up JDK ${{ matrix.java }}
164+
uses: actions/setup-java@c1e323688fd81a25caa38c78aa6df2d33d3e20d9 # v4
165+
with:
166+
java-version: ${{ matrix.java }}
167+
distribution: temurin
168+
cache: 'gradle'
169+
- name: Build and Run Tests
170+
run: |
171+
./gradlew integTest --parallel -PnumNodes=3 -PconfigureNodeRoles=${{ matrix.configureNodeRoles }}

formatter/formatting.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ allprojects {
77
target '**/*.java'
88

99
removeUnusedImports()
10-
eclipse().configFile rootProject.file('formatter/formatterConfig.xml')
10+
eclipse().withP2Mirrors(Map.of("https://download.eclipse.org/", "https://ci.opensearch.org/")).configFile rootProject.file('formatter/formatterConfig.xml')
1111
trimTrailingWhitespace()
1212
endWithNewline();
1313

0 commit comments

Comments
 (0)