Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 0 additions & 14 deletions .buildkite/jdk_availability_check_pipeline.yml

This file was deleted.

56 changes: 56 additions & 0 deletions .ci/updatecli/bump-java-version.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,56 @@
---
name: Update java version file
pipelineid: "logstash/jdk-version-updates-{{ requiredEnv "LOGSTASH_BRANCH" }}"

scms:
default:
kind: github
spec:
user: '{{ requiredEnv "GITHUB_ACTOR" }}'
username: '{{ requiredEnv "GITHUB_ACTOR" }}'
owner: '{{ .scm.owner }}'
repository: '{{ .scm.repository }}'
token: '{{ requiredEnv "GITHUB_TOKEN" }}'
branch: '{{ requiredEnv "LOGSTASH_BRANCH" }}'
commitusingapi: true
force: false

sources:
jdk_major:
kind: yaml
spec:
file: "versions.yml"
key: "$.bundled_jdk.revision"
transformers:
- findsubmatch:
pattern: '^(\d+)\.\d+\.\d+$'
captureindex: 1

latest_jdk_version:
kind: json
spec:
file: 'https://jvm-catalog.elastic.co/jdk/latest_adoptiumjdk_{{ source "jdk_major" }}_linux'
key: 'version'

latest_jdk_build:
kind: json
spec:
file: 'https://jvm-catalog.elastic.co/jdk/latest_adoptiumjdk_{{ source "jdk_major" }}_linux'
key: 'revision'

targets:
update_jdk_revision:
name: "Update JDK revision"
kind: yaml
sourceid: latest_jdk_version
spec:
file: versions.yml
key: $.bundled_jdk.revision

update_jdk_build:
name: "Update JDK build"
kind: yaml
sourceid: latest_jdk_build
spec:
file: versions.yml
key: $.bundled_jdk.build
30 changes: 18 additions & 12 deletions .github/workflows/bump-java-version.yml
Original file line number Diff line number Diff line change
@@ -1,19 +1,25 @@
name: Stub GH action for devoping new workflows [STUB]
name: bump-java-version

on:
schedule:
# Run weekly on Mondays at midnight UTC
- cron: '0 0 * * 1'
workflow_dispatch:
pull_request:
types: [opened, synchronize, reopened]

permissions:
pull-requests: write
contents: write

jobs:
stub_job_name:
name: Stub Job
bump:
permissions:
contents: write
pull-requests: write
runs-on: ubuntu-latest
steps:
- name: Stub step
run: |
echo "Stub to iterate via PR"

- uses: actions/checkout@v5

- uses: elastic/oblt-actions/updatecli/run@v1
with:
command: apply --config .ci/updatecli/bump-java-version.yml --values .ci/updatecli/values.d/scm.yml
version-file: .updatecli-version
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
LOGSTASH_BRANCH: ${{ github.ref_name }}
24 changes: 0 additions & 24 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -748,23 +748,6 @@ class JDKDetails {
return createElasticCatalogDownloadUrl()
}

// throws an error iff local version in versions.yml doesn't match the latest from JVM catalog.
void checkLocalVersionMatchingLatest() {
// retrieve the metadata from remote
def url = "https://jvm-catalog.elastic.co/jdk/latest_adoptiumjdk_${major}_${osName}"
def catalogMetadataUrl = URI.create(url).toURL()
def catalogConnection = catalogMetadataUrl.openConnection()
catalogConnection.requestMethod = 'GET'
assert catalogConnection.responseCode == 200

def metadataRetrieved = catalogConnection.content.text
def catalogMetadata = new JsonSlurper().parseText(metadataRetrieved)

if (catalogMetadata.version != revision || catalogMetadata.revision != build) {
throw new GradleException("Found new jdk version. Please update version.yml to ${catalogMetadata.version} build ${catalogMetadata.revision}")
}
}

private String createElasticCatalogDownloadUrl() {
// Ask details to catalog https://jvm-catalog.elastic.co/jdk and return the url to download the JDK

Expand Down Expand Up @@ -874,13 +857,6 @@ tasks.register("downloadJdk", Download) {
}
}

tasks.register("checkNewJdkVersion") {
// use Linux x86_64 as canary platform
def jdkDetails = new JDKDetails(gradle.ext.versions.bundled_jdk, "linux", "x86_64")
// throws Gradle exception if local and remote doesn't match
jdkDetails.checkLocalVersionMatchingLatest()
}

tasks.register("deleteLocalJdk", Delete) {
// CLI project properties: -Pjdk_bundle_os=[windows|linux|darwin]
String osName = selectOsType()
Expand Down
60 changes: 0 additions & 60 deletions catalog-info.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,6 @@ spec:
- resource:logstash-windows-jdk-matrix-pipeline
- resource:logstash-benchmark-pipeline
- resource:logstash-health-report-tests-pipeline
- resource:logstash-jdk-availability-check-pipeline

# ***********************************
# Declare serverless IT pipeline
Expand Down Expand Up @@ -744,62 +743,3 @@ spec:
branch: main
cronline: 30 20 * * *
message: Daily trigger of Health Report Tests Pipeline

# *******************************
# SECTION END: Health Report Tests pipeline
# *******************************

# ***********************************
# Declare JDK check pipeline
# ***********************************
---
# yaml-language-server: $schema=https://gist.githubusercontent.com/elasticmachine/988b80dae436cafea07d9a4a460a011d/raw/rre.schema.json
apiVersion: backstage.io/v1alpha1
kind: Resource
metadata:
name: logstash-jdk-availability-check-pipeline
description: ":logstash: check availability of new JDK version"
spec:
type: buildkite-pipeline
owner: group:logstash
system: platform-ingest
implementation:
apiVersion: buildkite.elastic.dev/v1
kind: Pipeline
metadata:
name: logstash-jdk-availability-check-pipeline
spec:
repository: elastic/logstash
pipeline_file: ".buildkite/jdk_availability_check_pipeline.yml"
maximum_timeout_in_minutes: 10
provider_settings:
trigger_mode: none # don't trigger jobs from github activity
env:
ELASTIC_SLACK_NOTIFICATIONS_ENABLED: 'true'
SLACK_NOTIFICATIONS_CHANNEL: '#logstash-build'
SLACK_NOTIFICATIONS_ON_SUCCESS: 'false'
SLACK_NOTIFICATIONS_SKIP_FOR_RETRIES: 'true'
teams:
logstash:
access_level: MANAGE_BUILD_AND_READ
ingest-eng-prod:
access_level: MANAGE_BUILD_AND_READ
everyone:
access_level: READ_ONLY
schedules:
Weekly JDK availability check (main):
branch: main
cronline: 0 2 * * 1 # every Monday@2AM UTC
message: Weekly trigger of JDK update availability pipeline per branch
env:
PIPELINES_TO_TRIGGER: 'logstash-jdk-availability-check-pipeline'
Weekly JDK availability check (8.19):
branch: "8.19"
cronline: 0 2 * * 1 # every Monday@2AM UTC
message: Weekly trigger of JDK update availability pipeline per branch
env:
PIPELINES_TO_TRIGGER: 'logstash-jdk-availability-check-pipeline'

# *******************************
# SECTION END: JDK check pipeline
# *******************************
7 changes: 0 additions & 7 deletions ci/check_jdk_version_availability.sh

This file was deleted.