Finalize name/location for versions.yml mapping

Author: donoghuc

.ci/updatecli/bump-logstash-version.yml

@@ -56,6 +56,16 @@ targets:
       key: $.logstash-core
       value: '{{ requiredEnv "LOGSTASH_VERSION" }}'
 
+  update_release_track:
+      name: Update logstash-release-track in versions.yml
+      kind: yaml
+      disablesourceinput: true
+      scmid: default
+      spec:
+        file: versions.yml
+        key: $.logstash-release-track
+        value: '{{ requiredEnv "LOGSTASH_RELEASE_TRACK" }}'
+
   update_gemfile_lock_dependency:
     name: Update logstash-core dependency in lockfile
     kind: file

.github/workflows/bump-logstash.yml

@@ -11,7 +11,10 @@ on:
         description: 'Logstash branch (example: 9.1)'
         required: true
         type: string
-
+      logstash_release_track:
+        description: 'Release track (example: 9.current, 9.previous, main)'
+        required: true
+        type: string
 jobs:
   bump:
     permissions:
@@ -29,3 +32,4 @@ jobs:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
           LOGSTASH_BRANCH: "${{ github.event.inputs.logstash_branch }}"
           LOGSTASH_VERSION: "${{ github.event.inputs.logstash_version }}"
+          LOGSTASH_RELEASE_TRACK: "${{ github.event.inputs.logstash_release_track }}"

ci/observabilitySREacceptance_tests.sh

@@ -2,10 +2,10 @@
 
 set -e
 
-# Look up corresponding LOGSTASH_STREAM from versions.yml
-LOGSTASH_STREAM=$(ruby -ryaml -e "puts YAML.load_file('versions.yml')['logstash-stream']")
+# Look up corresponding LOGSTASH_RELEASE_TRACK from versions.yml
+LOGSTASH_RELEASE_TRACK=$(ruby -ryaml -e "puts YAML.load_file('versions.yml')['logstash-release-track']")
 # Use logstash stream to find the corresponding stack verstion from logstash-versions.yml
-STACK_VERSION=$(ruby -ryaml -ropen-uri -e "puts YAML.load(URI.open('https://raw.githubusercontent.com/logstash-plugins/.ci/1.x/logstash-versions.yml'))['snapshots']['${LOGSTASH_STREAM}']")
+STACK_VERSION=$(ruby -ryaml -ropen-uri -e "puts YAML.load(URI.open('https://raw.githubusercontent.com/logstash-plugins/.ci/1.x/logstash-versions.yml'))['snapshots']['${LOGSTASH_RELEASE_TRACK}']")
 export OBSERVABILITY_SRE_IMAGE_VERSION="${OBSERVABILITY_SRE_IMAGE_VERSION:-$STACK_VERSION}"
 export ELASTICSEARCH_IMAGE_VERSION="${ELASTICSEARCH_IMAGE_VERSION:-$STACK_VERSION}"
 export FILEBEAT_IMAGE_VERSION="${FILEBEAT_IMAGE_VERSION:-$STACK_VERSION}"

ci/observabilitySREsmoke_tests.sh

@@ -3,10 +3,10 @@
 set -e
 
 QUALIFIED_VERSION="$(.buildkite/scripts/common/qualified-version.sh)"
-# Look up corresponding LOGSTASH_STREAM from versions.yml
-LOGSTASH_STREAM=$(ruby -ryaml -e "puts YAML.load_file('versions.yml')['logstash-stream']")
+# Look up corresponding LOGSTASH_RELEASE_TRACK from versions.yml
+LOGSTASH_RELEASE_TRACK=$(ruby -ryaml -e "puts YAML.load_file('versions.yml')['logstash-release-track']")
 # Use logstash stream to find the corresponding stack verstion from logstash-versions.yml
-STACK_VERSION=$(ruby -ryaml -ropen-uri -e "puts YAML.load(URI.open('https://raw.githubusercontent.com/logstash-plugins/.ci/1.x/logstash-versions.yml'))['snapshots']['${LOGSTASH_STREAM}']")
+STACK_VERSION=$(ruby -ryaml -ropen-uri -e "puts YAML.load(URI.open('https://raw.githubusercontent.com/logstash-plugins/.ci/1.x/logstash-versions.yml'))['snapshots']['${LOGSTASH_RELEASE_TRACK}']")
 export ELASTICSEARCH_IMAGE_VERSION="${ELASTICSEARCH_IMAGE_VERSION:-$STACK_VERSION}"
 export FILEBEAT_IMAGE_VERSION="${FILEBEAT_IMAGE_VERSION:-$STACK_VERSION}"
 

versions.yml

@@ -4,7 +4,7 @@ logstash: 9.3.0
 logstash-core: 9.3.0
 logstash-core-plugin-api: 2.1.16
 # Logstash stream corresponding to keys in https://github.com/logstash-plugins/.ci/blob/1.x/logstash-versions.yml
-logstash-stream: main
+logstash-release-track: main
 
 bundled_jdk:
   # for AdoptOpenJDK/OpenJDK jdk-14.0.1+7.1, the revision is 14.0.1 while the build is 7.1