From a139eab79dc1ad00088b412699f112f28aeb3168 Mon Sep 17 00:00:00 2001 From: Brian Seeders Date: Mon, 23 Oct 2023 16:23:41 -0400 Subject: [PATCH] [ci] Disable periodic java-matrix, java-fips-matrix, and bwc jobs in Jenkins (#101234) (#101242) (cherry picked from commit 6e6e85d0b4566eb9b7903708c92783adb49098d7) --- ...tic+elasticsearch+periodic+bwc-trigger.yml | 6 ---- .../elastic+elasticsearch+periodic+bwc.yml | 2 +- ...arch+periodic+java-fips-matrix-trigger.yml | 6 ---- ...lasticsearch+periodic+java-fips-matrix.yml | 3 +- ...ticsearch+periodic+java-matrix-trigger.yml | 6 ---- ...tic+elasticsearch+periodic+java-matrix.yml | 3 +- .../matrix-gradle-unix-disabled.yml | 32 +++++++++++++++++++ 7 files changed, 37 insertions(+), 21 deletions(-) delete mode 100644 .ci/jobs.t/elastic+elasticsearch+periodic+bwc-trigger.yml delete mode 100644 .ci/jobs.t/elastic+elasticsearch+periodic+java-fips-matrix-trigger.yml delete mode 100644 .ci/jobs.t/elastic+elasticsearch+periodic+java-matrix-trigger.yml create mode 100644 .ci/templates.t/matrix-gradle-unix-disabled.yml diff --git a/.ci/jobs.t/elastic+elasticsearch+periodic+bwc-trigger.yml b/.ci/jobs.t/elastic+elasticsearch+periodic+bwc-trigger.yml deleted file mode 100644 index 291ed41a5facf..0000000000000 --- a/.ci/jobs.t/elastic+elasticsearch+periodic+bwc-trigger.yml +++ /dev/null @@ -1,6 +0,0 @@ ---- -jjbb-template: periodic-trigger-lgc.yml -vars: - - periodic-job: elastic+elasticsearch+%BRANCH%+periodic+bwc - - lgc-job: elastic+elasticsearch+%BRANCH%+intake - - cron: "H H/8 * * *" diff --git a/.ci/jobs.t/elastic+elasticsearch+periodic+bwc.yml b/.ci/jobs.t/elastic+elasticsearch+periodic+bwc.yml index f4cadb7bad693..f7fc27816c4be 100644 --- a/.ci/jobs.t/elastic+elasticsearch+periodic+bwc.yml +++ b/.ci/jobs.t/elastic+elasticsearch+periodic+bwc.yml @@ -1,5 +1,5 @@ --- -jjbb-template: matrix-gradle-unix.yml +jjbb-template: matrix-gradle-unix-disabled.yml vars: - job-name: elastic+elasticsearch+%BRANCH%+periodic+bwc - job-display-name: "elastic / elasticsearch # %BRANCH% - backwards compatibility matrix" diff --git a/.ci/jobs.t/elastic+elasticsearch+periodic+java-fips-matrix-trigger.yml b/.ci/jobs.t/elastic+elasticsearch+periodic+java-fips-matrix-trigger.yml deleted file mode 100644 index fb2a23855cc9f..0000000000000 --- a/.ci/jobs.t/elastic+elasticsearch+periodic+java-fips-matrix-trigger.yml +++ /dev/null @@ -1,6 +0,0 @@ ---- -jjbb-template: periodic-trigger-lgc.yml -vars: - - periodic-job: elastic+elasticsearch+%BRANCH%+periodic+java-fips-matrix - - lgc-job: elastic+elasticsearch+%BRANCH%+intake - - cron: "H H/12 * * *" diff --git a/.ci/jobs.t/elastic+elasticsearch+periodic+java-fips-matrix.yml b/.ci/jobs.t/elastic+elasticsearch+periodic+java-fips-matrix.yml index cc6f2d38d5918..b1fd03c08208c 100644 --- a/.ci/jobs.t/elastic+elasticsearch+periodic+java-fips-matrix.yml +++ b/.ci/jobs.t/elastic+elasticsearch+periodic+java-fips-matrix.yml @@ -2,7 +2,8 @@ - job: name: "elastic+elasticsearch+%BRANCH%+periodic+java-fips-matrix" display-name: "elastic / elasticsearch # %BRANCH% - java fips compatibility matrix" - description: "Testing of the Elasticsearch %BRANCH% branch java FIPS compatibility matrix.\n" + description: "This job has been migrated to Buildkite.\n" + disabled: true project-type: matrix child-workspace: /dev/shm/elastic+elasticsearch+%BRANCH%+periodic+java-fips-matrix node: master diff --git a/.ci/jobs.t/elastic+elasticsearch+periodic+java-matrix-trigger.yml b/.ci/jobs.t/elastic+elasticsearch+periodic+java-matrix-trigger.yml deleted file mode 100644 index 8de3326dd819d..0000000000000 --- a/.ci/jobs.t/elastic+elasticsearch+periodic+java-matrix-trigger.yml +++ /dev/null @@ -1,6 +0,0 @@ ---- -jjbb-template: periodic-trigger-lgc.yml -vars: - - periodic-job: elastic+elasticsearch+%BRANCH%+periodic+java-matrix - - lgc-job: elastic+elasticsearch+%BRANCH%+intake - - cron: "H H/12 * * *" diff --git a/.ci/jobs.t/elastic+elasticsearch+periodic+java-matrix.yml b/.ci/jobs.t/elastic+elasticsearch+periodic+java-matrix.yml index 07f4a8c5b6760..963e72b81f305 100644 --- a/.ci/jobs.t/elastic+elasticsearch+periodic+java-matrix.yml +++ b/.ci/jobs.t/elastic+elasticsearch+periodic+java-matrix.yml @@ -2,7 +2,8 @@ - job: name: "elastic+elasticsearch+%BRANCH%+periodic+java-matrix" display-name: "elastic / elasticsearch # %BRANCH% - java compatibility matrix" - description: "Testing of the Elasticsearch %BRANCH% branch java compatibility matrix.\n" + description: "This job has been migrated to Buildkite.\n" + disabled: true project-type: matrix child-workspace: /dev/shm/elastic+elasticsearch+%BRANCH%+periodic+java-matrix node: master diff --git a/.ci/templates.t/matrix-gradle-unix-disabled.yml b/.ci/templates.t/matrix-gradle-unix-disabled.yml new file mode 100644 index 0000000000000..1eafe77a5ec78 --- /dev/null +++ b/.ci/templates.t/matrix-gradle-unix-disabled.yml @@ -0,0 +1,32 @@ +--- +- job: + name: "{job-name}" + display-name: "{job-display-name}" + description: "This job has been migrated to Buildkite.\n" + disabled: true + project-type: matrix + child-workspace: /dev/shm/{job-name} + node: master + scm: + - git: + wipe-workspace: false + axes: + - axis: + type: slave + name: nodes + values: + - "general-purpose" + - axis: + type: yaml + filename: "{matrix-yaml-file}" + name: "{matrix-variable}" + builders: + - inject: + properties-file: ".ci/java-versions.properties" + properties-content: | + JAVA_HOME=$HOME/.java/$ES_BUILD_JAVA + JAVA11_HOME=$HOME/.java/java11 + JAVA16_HOME=$HOME/.java/openjdk16 + - shell: | + #!/usr/local/bin/runbld --redirect-stderr + $WORKSPACE/.ci/scripts/run-gradle.sh {gradle-args}