Skip to content

Commit a0532c6

Browse files
committed
Add opt-in Windows pull request checks
1 parent 1a719eb commit a0532c6

4 files changed

+88
-2
lines changed

.ci/jobs.t/elastic+elasticsearch+pull-request+part-1-fips.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,4 +35,4 @@
3535
RUNTIME_JAVA_HOME=$HOME/.java/$ES_RUNTIME_JAVA
3636
- shell: |
3737
#!/usr/local/bin/runbld --redirect-stderr
38-
$WORKSPACE/.ci/scripts/run-gradle.sh -Dignore.tests.seed checkPart1
38+
$WORKSPACE/.ci/scripts/run-gradle.sh -Dignore.tests.seed -Dtests.fips.enabled=true checkPart1
Lines changed: 43 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,43 @@
1+
---
2+
- job:
3+
name: "elastic+elasticsearch+%BRANCH%+pull-request/elastic+elasticsearch+%BRANCH%+pull-request+part-1-windows"
4+
display-name: "elastic / elasticsearch # %BRANCH% - pull request part-1 windows"
5+
description: "Testing of Elasticsearch pull requests - part-1 windows"
6+
node: "windows-immutable"
7+
scm:
8+
- git:
9+
refspec: "+refs/pull/${ghprbPullId}/*:refs/remotes/origin/pr/${ghprbPullId}/*"
10+
branches:
11+
- "${ghprbActualCommit}"
12+
triggers:
13+
- github-pull-request:
14+
org-list:
15+
- elastic
16+
allow-whitelist-orgs-as-admins: true
17+
trigger-phrase: '.*run\W+elasticsearch-ci/part-1-windows.*'
18+
github-hooks: true
19+
status-context: elasticsearch-ci/part-1-windows
20+
cancel-builds-on-update: true
21+
white-list-target-branches:
22+
- %BRANCH%
23+
- ^feature/.*
24+
excluded-regions:
25+
- ^docs/.*
26+
white-list-labels:
27+
- 'test-windows'
28+
black-list-labels:
29+
- '>test-mute'
30+
builders:
31+
- inject:
32+
properties-file: '.ci/java-versions.properties'
33+
properties-content: |
34+
JAVA_HOME=$USERPROFILE\\.java\\$ES_BUILD_JAVA
35+
RUNTIME_JAVA_HOME=$USERPROFILE\\.java\\$ES_RUNTIME_JAVA
36+
GRADLE_TASK=checkPart1
37+
- batch: |
38+
del /f /s /q %USERPROFILE%\.gradle\init.d\*.*
39+
mkdir %USERPROFILE%\.gradle\init.d
40+
copy .ci\init.gradle %USERPROFILE%\.gradle\init.d\
41+
(
42+
echo call %GRADLEW_BAT% --max-workers=4 -Dbwc.checkout.align=true %GRADLE_TASK% ^|^| exit /b 1
43+
) | java -jar "C:\Program Files\infra\bin\runbld" --redirect-stderr -

.ci/jobs.t/elastic+elasticsearch+pull-request+part-2-fips.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,4 +35,4 @@
3535
RUNTIME_JAVA_HOME=$HOME/.java/$ES_RUNTIME_JAVA
3636
- shell: |
3737
#!/usr/local/bin/runbld --redirect-stderr
38-
$WORKSPACE/.ci/scripts/run-gradle.sh -Dignore.tests.seed checkPart2
38+
$WORKSPACE/.ci/scripts/run-gradle.sh -Dignore.tests.seed -Dtests.fips.enabled=true checkPart2
Lines changed: 43 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,43 @@
1+
---
2+
- job:
3+
name: "elastic+elasticsearch+%BRANCH%+pull-request/elastic+elasticsearch+%BRANCH%+pull-request+part-2-windows"
4+
display-name: "elastic / elasticsearch # %BRANCH% - pull request part-2 windows"
5+
description: "Testing of Elasticsearch pull requests - part-2 windows"
6+
node: "windows-immutable"
7+
scm:
8+
- git:
9+
refspec: "+refs/pull/${ghprbPullId}/*:refs/remotes/origin/pr/${ghprbPullId}/*"
10+
branches:
11+
- "${ghprbActualCommit}"
12+
triggers:
13+
- github-pull-request:
14+
org-list:
15+
- elastic
16+
allow-whitelist-orgs-as-admins: true
17+
trigger-phrase: '.*run\W+elasticsearch-ci/part-2-windows.*'
18+
github-hooks: true
19+
status-context: elasticsearch-ci/part-2-windows
20+
cancel-builds-on-update: true
21+
white-list-target-branches:
22+
- %BRANCH%
23+
- ^feature/.*
24+
excluded-regions:
25+
- ^docs/.*
26+
white-list-labels:
27+
- 'test-windows'
28+
black-list-labels:
29+
- '>test-mute'
30+
builders:
31+
- inject:
32+
properties-file: '.ci/java-versions.properties'
33+
properties-content: |
34+
JAVA_HOME=$USERPROFILE\\.java\\$ES_BUILD_JAVA
35+
RUNTIME_JAVA_HOME=$USERPROFILE\\.java\\$ES_RUNTIME_JAVA
36+
GRADLE_TASK=checkPart2
37+
- batch: |
38+
del /f /s /q %USERPROFILE%\.gradle\init.d\*.*
39+
mkdir %USERPROFILE%\.gradle\init.d
40+
copy .ci\init.gradle %USERPROFILE%\.gradle\init.d\
41+
(
42+
echo call %GRADLEW_BAT% --max-workers=4 -Dbwc.checkout.align=true %GRADLE_TASK% ^|^| exit /b 1
43+
) | java -jar "C:\Program Files\infra\bin\runbld" --redirect-stderr -

0 commit comments

Comments
 (0)