Skip to content

Commit 4165b0c

Browse files
Update OpenSearch gradle check version file location (#606)
Signed-off-by: Peter Zhu <zhujiaxi@amazon.com>
1 parent dbf78ad commit 4165b0c

File tree

3 files changed

+6
-6
lines changed

3 files changed

+6
-6
lines changed

tests/jenkins/jobs/RunGradleCheckBwcAlign_Jenkinsfile.txt

+2-2
Original file line numberDiff line numberDiff line change
@@ -23,8 +23,8 @@
2323
git rev-parse HEAD
2424

2525
echo "Get Major Version"
26-
OS_VERSION=`cat buildSrc/version.properties | grep opensearch | cut -d= -f2 | grep -oE '[0-9.]+'`
27-
JDK_MAJOR_VERSION=`cat buildSrc/version.properties | grep "bundled_jdk" | cut -d= -f2 | grep -oE '[0-9]+' | head -n 1`
26+
OS_VERSION=`cat gradle/libs.versions.toml | grep opensearch | cut -d= -f2 | grep -oE '[0-9.]+'`
27+
JDK_MAJOR_VERSION=`cat gradle/libs.versions.toml | grep "bundled_jdk" | cut -d= -f2 | grep -oE '[0-9]+' | head -n 1`
2828
OS_MAJOR_VERSION=`echo $OS_VERSION | grep -oE '[0-9]+' | head -n 1`
2929
echo "Version: $OS_VERSION, Major Version: $OS_MAJOR_VERSION"
3030

tests/jenkins/jobs/RunGradleCheck_Jenkinsfile.txt

+2-2
Original file line numberDiff line numberDiff line change
@@ -23,8 +23,8 @@
2323
git rev-parse HEAD
2424

2525
echo "Get Major Version"
26-
OS_VERSION=`cat buildSrc/version.properties | grep opensearch | cut -d= -f2 | grep -oE '[0-9.]+'`
27-
JDK_MAJOR_VERSION=`cat buildSrc/version.properties | grep "bundled_jdk" | cut -d= -f2 | grep -oE '[0-9]+' | head -n 1`
26+
OS_VERSION=`cat gradle/libs.versions.toml | grep opensearch | cut -d= -f2 | grep -oE '[0-9.]+'`
27+
JDK_MAJOR_VERSION=`cat gradle/libs.versions.toml | grep "bundled_jdk" | cut -d= -f2 | grep -oE '[0-9]+' | head -n 1`
2828
OS_MAJOR_VERSION=`echo $OS_VERSION | grep -oE '[0-9]+' | head -n 1`
2929
echo "Version: $OS_VERSION, Major Version: $OS_MAJOR_VERSION"
3030

vars/runGradleCheck.groovy

+2-2
Original file line numberDiff line numberDiff line change
@@ -44,8 +44,8 @@ void call(Map args = [:]) {
4444
git rev-parse HEAD
4545
4646
echo "Get Major Version"
47-
OS_VERSION=`cat buildSrc/version.properties | grep opensearch | cut -d= -f2 | grep -oE '[0-9.]+'`
48-
JDK_MAJOR_VERSION=`cat buildSrc/version.properties | grep "bundled_jdk" | cut -d= -f2 | grep -oE '[0-9]+' | head -n 1`
47+
OS_VERSION=`cat gradle/libs.versions.toml | grep opensearch | cut -d= -f2 | grep -oE '[0-9.]+'`
48+
JDK_MAJOR_VERSION=`cat gradle/libs.versions.toml | grep "bundled_jdk" | cut -d= -f2 | grep -oE '[0-9]+' | head -n 1`
4949
OS_MAJOR_VERSION=`echo \$OS_VERSION | grep -oE '[0-9]+' | head -n 1`
5050
echo "Version: \$OS_VERSION, Major Version: \$OS_MAJOR_VERSION"
5151

0 commit comments

Comments
 (0)