github-mirrors/elasticsearch
1
0
Fork 0
mirror of https://github.com/elastic/elasticsearch.git synced 2025-06-28 17:34:17 -04:00
Code Issues Projects Releases Packages Wiki Activity

Revert build changes from multi-project

Browse source
This commit is contained in:
Tim Vernum 2025-02-25 17:31:06 +11:00
parent 7686d47f54
commit a23175d63a
5 changed files with 26 additions and 33 deletions
Download patch file Download diff file Expand all files Collapse all files

10
.buildkite/hooks/pre-command
View file

@ -44,14 +44,8 @@ export GRADLE_BUILD_CACHE_USERNAME
GRADLE_BUILD_CACHE_PASSWORD=$(vault read -field=password secret/ci/elastic-elasticsearch/migrated/gradle-build-cache) GRADLE_BUILD_CACHE_PASSWORD=$(vault read -field=password secret/ci/elastic-elasticsearch/migrated/gradle-build-cache)
export GRADLE_BUILD_CACHE_PASSWORD export GRADLE_BUILD_CACHE_PASSWORD
DEVELOCITY_ACCESS_KEY="$(vault read -field=accesskey secret/ci/elastic-elasticsearch/migrated/gradle-build-cache)" DEVELOCITY_ACCESS_KEY="gradle-enterprise.elastic.co=$(vault read -field=accesskey secret/ci/elastic-elasticsearch/migrated/gradle-build-cache)"
if [ -n "${DEVELOCITY_ACCESS_KEY}" ] export DEVELOCITY_ACCESS_KEY
then
DEVELOCITY_ACCESS_KEY="gradle-enterprise.elastic.co=${DEVELOCITY_ACCESS_KEY}"
export DEVELOCITY_ACCESS_KEY
else
printf "%s: Error obtaining DEVELOCITY_ACCESS_KEY from Vault" "$0" | tee -a /dev/stderr
fi
BUILDKITE_API_TOKEN=$(vault read -field=token secret/ci/elastic-elasticsearch/buildkite-api-token) BUILDKITE_API_TOKEN=$(vault read -field=token secret/ci/elastic-elasticsearch/buildkite-api-token)
export BUILDKITE_API_TOKEN export BUILDKITE_API_TOKEN

20
.buildkite/pipelines/intake.template.yml
View file

@ -92,13 +92,13 @@ steps:
image: family/elasticsearch-ubuntu-2004 image: family/elasticsearch-ubuntu-2004
machineType: custom-32-98304 machineType: custom-32-98304
buildDirectory: /dev/shm/bk buildDirectory: /dev/shm/bk
# - wait - wait
# - trigger: elasticsearch-dra-workflow - trigger: elasticsearch-dra-workflow
# label: Trigger DRA snapshot workflow label: Trigger DRA snapshot workflow
# async: true async: true
# branches: "main 9.* 8.* 7.17" branches: "main 9.* 8.* 7.17"
# build: build:
# branch: "$BUILDKITE_BRANCH" branch: "$BUILDKITE_BRANCH"
# commit: "$BUILDKITE_COMMIT" commit: "$BUILDKITE_COMMIT"
# env: env:
# DRA_WORKFLOW: snapshot DRA_WORKFLOW: snapshot

20
.buildkite/pipelines/intake.yml
View file

@ -93,13 +93,13 @@ steps:
image: family/elasticsearch-ubuntu-2004 image: family/elasticsearch-ubuntu-2004
machineType: custom-32-98304 machineType: custom-32-98304
buildDirectory: /dev/shm/bk buildDirectory: /dev/shm/bk
# - wait - wait
# - trigger: elasticsearch-dra-workflow - trigger: elasticsearch-dra-workflow
# label: Trigger DRA snapshot workflow label: Trigger DRA snapshot workflow
# async: true async: true
# branches: "main 9.* 8.* 7.17" branches: "main 9.* 8.* 7.17"
# build: build:
# branch: "$BUILDKITE_BRANCH" branch: "$BUILDKITE_BRANCH"
# commit: "$BUILDKITE_COMMIT" commit: "$BUILDKITE_COMMIT"
# env: env:
# DRA_WORKFLOW: snapshot DRA_WORKFLOW: snapshot

2
.buildkite/pull-requests.json
View file

@ -2,7 +2,7 @@
"jobs": [ "jobs": [
{ {
"enabled": true, "enabled": true,
"pipeline_slug": "elasticsearch-multi-project-pull-request", "pipeline_slug": "elasticsearch-pull-request",
"allow_org_users": true, "allow_org_users": true,
"allowed_repo_permissions": [ "allowed_repo_permissions": [
"admin", "admin",

7
catalog-info.yaml
View file

@ -123,7 +123,7 @@ spec:
pipeline_file: .buildkite/pipelines/lucene-snapshot/build-snapshot.yml pipeline_file: .buildkite/pipelines/lucene-snapshot/build-snapshot.yml
env: env:
ELASTIC_SLACK_NOTIFICATIONS_ENABLED: "true" ELASTIC_SLACK_NOTIFICATIONS_ENABLED: "true"
SLACK_NOTIFICATIONS_CHANNEL: "#lucene" SLACK_NOTIFICATIONS_CHANNEL: "#lucene-ci"
SLACK_NOTIFICATIONS_ALL_BRANCHES: "true" SLACK_NOTIFICATIONS_ALL_BRANCHES: "true"
branch_configuration: lucene_snapshot branch_configuration: lucene_snapshot
default_branch: lucene_snapshot default_branch: lucene_snapshot
@ -167,9 +167,8 @@ spec:
pipeline_file: .buildkite/pipelines/lucene-snapshot/update-branch.yml pipeline_file: .buildkite/pipelines/lucene-snapshot/update-branch.yml
env: env:
ELASTIC_SLACK_NOTIFICATIONS_ENABLED: "true" ELASTIC_SLACK_NOTIFICATIONS_ENABLED: "true"
SLACK_NOTIFICATIONS_CHANNEL: "#lucene" SLACK_NOTIFICATIONS_CHANNEL: "#lucene-ci"
SLACK_NOTIFICATIONS_ALL_BRANCHES: "true" SLACK_NOTIFICATIONS_ALL_BRANCHES: "true"
branch_configuration: lucene_snapshot
default_branch: lucene_snapshot default_branch: lucene_snapshot
teams: teams:
elasticsearch-team: {} elasticsearch-team: {}
@ -211,7 +210,7 @@ spec:
pipeline_file: .buildkite/pipelines/lucene-snapshot/run-tests.yml pipeline_file: .buildkite/pipelines/lucene-snapshot/run-tests.yml
env: env:
ELASTIC_SLACK_NOTIFICATIONS_ENABLED: "true" ELASTIC_SLACK_NOTIFICATIONS_ENABLED: "true"
SLACK_NOTIFICATIONS_CHANNEL: "#lucene" SLACK_NOTIFICATIONS_CHANNEL: "#lucene-ci"
SLACK_NOTIFICATIONS_ALL_BRANCHES: "true" SLACK_NOTIFICATIONS_ALL_BRANCHES: "true"
branch_configuration: lucene_snapshot branch_configuration: lucene_snapshot
default_branch: lucene_snapshot default_branch: lucene_snapshot