Skip to content

Commit 1d9eb5b

Browse files
authored
7.17 reached EoL (#18559)
1 parent 602cda0 commit 1d9eb5b

File tree

5 files changed

+2
-21
lines changed

5 files changed

+2
-21
lines changed

.buildkite/scripts/dra/publish.sh

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -36,12 +36,6 @@ esac
3636

3737
info "Uploading artifacts for ${WORKFLOW_TYPE} workflow on branch: ${RELEASE_BRANCH} for version: ${STACK_VERSION} with version_qualifier: ${VERSION_QUALIFIER}"
3838

39-
if [ "$RELEASE_VER" != "7.17" ]; then
40-
# Version 7.17.x doesn't generates ARM artifacts for Darwin
41-
# TODO see if we need to do anything here
42-
:
43-
fi
44-
4539
info "Downloaded ARTIFACTS sha report"
4640
for file in build/logstash-*; do shasum $file;done
4741

.buildkite/scripts/snyk/plugins-scan/generate-steps.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ def call_url_with_retry(url: str, max_retries: int = 5, delay: int = 1) -> reque
3939
def fetch_release_branches() -> list:
4040
"""
4141
Fetch release branches from artifacts-api.
42-
Returns list of branch names (e.g., ["7.17", "8.19", "9.1", "9.2", "9.3", "main"]).
42+
Returns list of branch names (e.g., ["8.19", "9.1", "9.2", "9.3", "main"]).
4343
"""
4444
global _release_branches_cache
4545
if _release_branches_cache is not None:

.buildkite/scripts/snyk/report.sh

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -52,12 +52,6 @@ download_auth_snyk
5252
# clone Logstash repo, build and report
5353
for TARGET_BRANCH in "${TARGET_BRANCHES[@]}"
5454
do
55-
if [ "$TARGET_BRANCH" == "7.17" ]; then
56-
echo "Installing and configuring JDK11."
57-
export OLD_PATH=$PATH
58-
install_java_11
59-
export PATH=$PWD/jdk-11.0.24+8/bin:$PATH
60-
fi
6155
git reset --hard HEAD # reset if any generated files appeared
6256
# check if target branch exists
6357
echo "Checking out $TARGET_BRANCH branch."
@@ -67,10 +61,4 @@ do
6761
else
6862
echo "$TARGET_BRANCH branch doesn't exist."
6963
fi
70-
if [ "$TARGET_BRANCH" == "7.17" ]; then
71-
# reset state
72-
echo "Removing JDK11 installation."
73-
rm -rf jdk-11.0.24+8
74-
export PATH=$OLD_PATH
75-
fi
7664
done

.github/workflows/bump-java-version.yml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,6 @@ jobs:
1919
- id: generator
2020
uses: elastic/oblt-actions/elastic/active-branches@v1
2121
with:
22-
exclude-branches: "7.17"
2322
filter-branches: true
2423
bump:
2524
permissions:

.github/workflows/pre-commit.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ on:
55
push:
66
branches:
77
- main
8-
- 8.*
8+
- "8.19"
99
- 9.*
1010

1111
permissions:

0 commit comments

Comments
 (0)