Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/main' into gather-all-replicas-u…
Browse files Browse the repository at this point in the history
…nassigned
  • Loading branch information
dakrone committed Nov 2, 2023
2 parents c93d295 + 8485cd7 commit 94c24ef
Show file tree
Hide file tree
Showing 490 changed files with 7,269 additions and 2,992 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@ jjbb-template: matrix-gradle-unix.yml
vars:
- job-name: elastic+elasticsearch+%BRANCH%+intake+multijob+bwc-snapshots
- job-display-name: "elastic / elasticsearch # %BRANCH% - intake bwc"
- job-description: Elasticsearch %BRANCH% branch intake backwards compatibility checks.
- matrix-yaml-file: ".ci/snapshotBwcVersions"
- matrix-variable: BWC_VERSION
- gradle-args: "-Dbwc.checkout.align=true -Dorg.elasticsearch.build.cache.push=true -Dignore.tests.seed -Dscan.capture-task-input-files v$BWC_VERSION#bwcTest"
1 change: 0 additions & 1 deletion .ci/jobs.t/elastic+elasticsearch+intake+multijob+part1.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,5 +3,4 @@ jjbb-template: generic-gradle-unix.yml
vars:
- job-name: elastic+elasticsearch+%BRANCH%+intake+multijob+part1
- job-display-name: "elastic / elasticsearch # %BRANCH% - intake part 1"
- job-description: Elasticsearch %BRANCH% branch intake check part 1.
- gradle-args: "-Dbwc.checkout.align=true -Dorg.elasticsearch.build.cache.push=true -Dignore.tests.seed -Dscan.capture-task-input-files checkPart1"
1 change: 0 additions & 1 deletion .ci/jobs.t/elastic+elasticsearch+intake+multijob+part2.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,5 +3,4 @@ jjbb-template: generic-gradle-unix.yml
vars:
- job-name: elastic+elasticsearch+%BRANCH%+intake+multijob+part2
- job-display-name: "elastic / elasticsearch # %BRANCH% - intake part 2"
- job-description: Elasticsearch %BRANCH% branch intake check part 2.
- gradle-args: "-Dbwc.checkout.align=true -Dorg.elasticsearch.build.cache.push=true -Dignore.tests.seed -Dscan.capture-task-input-files checkPart2"
1 change: 0 additions & 1 deletion .ci/jobs.t/elastic+elasticsearch+intake+multijob+part3.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,5 +3,4 @@ jjbb-template: generic-gradle-unix.yml
vars:
- job-name: elastic+elasticsearch+%BRANCH%+intake+multijob+part3
- job-display-name: "elastic / elasticsearch # %BRANCH% - intake part 3"
- job-description: Elasticsearch %BRANCH% branch intake check part 3.
- gradle-args: "-Dbwc.checkout.align=true -Dorg.elasticsearch.build.cache.push=true -Dignore.tests.seed -Dscan.capture-task-input-files checkPart3"
Original file line number Diff line number Diff line change
Expand Up @@ -3,5 +3,4 @@ jjbb-template: generic-gradle-unix.yml
vars:
- job-name: elastic+elasticsearch+%BRANCH%+intake+multijob+rest-compat
- job-display-name: "elastic / elasticsearch # %BRANCH% - intake rest compatibility"
- job-description: Elasticsearch %BRANCH% branch intake REST compatibility checks.
- gradle-args: "-Dbwc.checkout.align=true -Dorg.elasticsearch.build.cache.push=true -Dignore.tests.seed -Dscan.capture-task-input-files checkRestCompat"
Original file line number Diff line number Diff line change
Expand Up @@ -3,5 +3,4 @@ jjbb-template: generic-gradle-unix.yml
vars:
- job-name: elastic+elasticsearch+%BRANCH%+intake+multijob+sanity-check
- job-display-name: "elastic / elasticsearch # %BRANCH% - intake sanity check"
- job-description: Elasticsearch %BRANCH% branch intake sanity check.
- gradle-args: "-Dbwc.checkout.align=true -Dorg.elasticsearch.build.cache.push=true -Dignore.tests.seed -Dscan.capture-task-input-files precommit"
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,8 @@
- job:
name: elastic+elasticsearch+%BRANCH%+intake+multijob+update-last-good-commit
display-name: "elastic / elasticsearch # %BRANCH% - update last good commit"
description: Elasticsearch %BRANCH% branch update last good commit in build-stats.
description: "This job has been migrated to Buildkite.\n"
disabled: true
node: light
properties: []
builders:
Expand Down
18 changes: 3 additions & 15 deletions .ci/jobs.t/elastic+elasticsearch+intake.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,24 +2,12 @@
- job:
name: elastic+elasticsearch+%BRANCH%+intake
display-name: "elastic / elasticsearch # %BRANCH% - intake"
description: "Testing of the Elasticsearch %BRANCH% branch on every push.\n"
description: "This job has been migrated to Buildkite.\n"
disabled: true
project-type: multijob
node: master
vault: []
triggers:
# We use this trigger instead of the provided "github" webhook trigger because it's more robust.
# Here we only trigger builds for pushes to the corresponding branch, rather than a push to any branch of the
# configured git repository. This avoids duplicate builds being triggered when pushes to multiple branches are
# done in quick succession.
- generic-webhook-trigger:
post-content-params:
- type: JSONPath
key: ref
value: '$.ref'
regex-filter-text: '$ref'
regex-filter-expression: "^refs/heads/%BRANCH%$"
cause: Push to GitHub (refs/heads/%BRANCH%)
silent-response: true
triggers: []
scm:
- git:
wipe-workspace: false
Expand Down
2 changes: 1 addition & 1 deletion .ci/jobs.t/elastic+elasticsearch+periodic+bwc.yml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
---
jjbb-template: matrix-gradle-unix-disabled.yml
jjbb-template: matrix-gradle-unix.yml
vars:
- job-name: elastic+elasticsearch+%BRANCH%+periodic+bwc
- job-display-name: "elastic / elasticsearch # %BRANCH% - backwards compatibility matrix"
Expand Down
5 changes: 3 additions & 2 deletions .ci/templates.t/generic-gradle-unix.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,12 @@
- job:
name: "{job-name}"
display-name: "{job-display-name}"
description: "{job-description}"
description: "This job has been migrated to Buildkite.\n"
disabled: true
workspace: /dev/shm/{job-name}
builders:
- inject:
properties-file: '.ci/java-versions.properties'
properties-file: ".ci/java-versions.properties"
properties-content: |
JAVA_HOME=$HOME/.java/$ES_BUILD_JAVA
JAVA11_HOME=$HOME/.java/java11
Expand Down
32 changes: 0 additions & 32 deletions .ci/templates.t/matrix-gradle-unix-disabled.yml

This file was deleted.

5 changes: 3 additions & 2 deletions .ci/templates.t/matrix-gradle-unix.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,8 @@
- job:
name: "{job-name}"
display-name: "{job-display-name}"
description: "{job-description}"
description: "This job has been migrated to Buildkite.\n"
disabled: true
project-type: matrix
child-workspace: /dev/shm/{job-name}
node: master
Expand All @@ -21,7 +22,7 @@
name: "{matrix-variable}"
builders:
- inject:
properties-file: '.ci/java-versions.properties'
properties-file: ".ci/java-versions.properties"
properties-content: |
JAVA_HOME=$HOME/.java/$ES_BUILD_JAVA
JAVA11_HOME=$HOME/.java/java11
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -129,19 +129,30 @@ buildScan {
link 'Source', "https://github.com/${repository}/tree/${BuildParams.gitRevision}"
}

buildScanPublished { scan ->
// Attach build scan link as build metadata
// See: https://buildkite.com/docs/pipelines/build-meta-data
new ProcessBuilder('buildkite-agent', 'meta-data', 'set', "build-scan-${System.getenv('BUILDKITE_JOB_ID')}", "${scan.buildScanUri}")
.start()
.waitFor()

// Add a build annotation
// See: https://buildkite.com/docs/agent/v3/cli-annotate
def body = """<div class="mb3"><span class="p1 border rounded">${System.getenv('BUILDKITE_LABEL')}</span> :gradle: build ran: <a href="${scan.buildScanUri}"><code>gradle ${gradle.startParameter.taskNames.join(' ')}</code></a></div>"""
new ProcessBuilder('buildkite-agent', 'annotate', '--context', 'gradle-build-scans', '--append', '--style', 'info', body)
.start()
.waitFor()
buildFinished { result ->
buildScanPublished { scan ->
// Attach build scan link as build metadata
// See: https://buildkite.com/docs/pipelines/build-meta-data
new ProcessBuilder('buildkite-agent', 'meta-data', 'set', "build-scan-${System.getenv('BUILDKITE_JOB_ID')}", "${scan.buildScanUri}")
.start()
.waitFor()

// Add a build annotation
// See: https://buildkite.com/docs/agent/v3/cli-annotate
def body = """<div class="mb3"><span class="p1 border rounded">${System.getenv('BUILDKITE_LABEL')}</span> :gradle: ${result.failure ? 'failed' : 'successful'} build: <a href="${scan.buildScanUri}"><code>gradle ${gradle.startParameter.taskNames.join(' ')}</code></a></div>"""
new ProcessBuilder(
'buildkite-agent',
'annotate',
'--context',
'gradle-build-scans',
'--append',
'--style',
result.failure ? 'error' : 'info',
body
)
.start()
.waitFor()
}
}
} else {
tag 'LOCAL'
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,70 @@
/*
* Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
* or more contributor license agreements. Licensed under the Elastic License
* 2.0 and the Server Side Public License, v 1; you may not use this file except
* in compliance with, at your election, the Elastic License 2.0 or the Server
* Side Public License, v 1.
*/

package org.elasticsearch.gradle.internal.docker;

import java.util.Objects;

/**
* This class models the result of running a command. It captures the exit code, standard output and standard error and allows
* applying String filter for stdout as this is intended to create configuration cache compatible output which
* aims to be agnostic.
*/
public class DockerResult {

private int exitCode;
private String stdout;
private String stderr;

public DockerResult(int exitCode, String stdout, String stderr) {
this.exitCode = exitCode;
this.stdout = stdout;
this.stderr = stderr;
}

public int getExitCode() {
return exitCode;
}

public String getStdout() {
return stdout;
}

public String getStderr() {
return stderr;
}

public void setExitCode(int exitCode) {
this.exitCode = exitCode;
}

public void setStdout(String stdout) {
this.stdout = stdout;
}

public void setStderr(String stderr) {
this.stderr = stderr;
}

public boolean isSuccess() {
return exitCode == 0;
}

@Override
public boolean equals(Object o) {
if (this == o) return true;
if (o == null || getClass() != o.getClass()) return false;
DockerResult that = (DockerResult) o;
return exitCode == that.exitCode && Objects.equals(stdout, that.stdout) && Objects.equals(stderr, that.stderr);
}

@Override
public int hashCode() {
return Objects.hash(exitCode, stdout, stderr);
}
}
Loading

0 comments on commit 94c24ef

Please sign in to comment.