Skip to content

Commit 07b8bdf

Browse files
woopwoop
authored
Update e2e tests to allow non-snapshot testing (#672)
1 parent 6dd9a86 commit 07b8bdf

3 files changed

Lines changed: 18 additions & 9 deletions

File tree

‎infra/scripts/test-end-to-end-batch.sh‎

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,10 @@ test -z ${SKIP_BUILD_JARS} && SKIP_BUILD_JARS="false"
88
test -z ${GOOGLE_CLOUD_PROJECT} && GOOGLE_CLOUD_PROJECT="kf-feast"
99
test -z ${TEMP_BUCKET} && TEMP_BUCKET="feast-templocation-kf-feast"
1010
test -z ${JOBS_STAGING_LOCATION} && JOBS_STAGING_LOCATION="gs://${TEMP_BUCKET}/staging-location"
11-
test -z ${JAR_VERSION_SUFFIX} && JAR_VERSION_SUFFIX="-SNAPSHOT"
11+
12+
# Get the current build version using maven (and pom.xml)
13+
FEAST_BUILD_VERSION=$(mvn help:evaluate -Dexpression=project.version -q -DforceStdout)
14+
echo Building version: $FEAST_BUILD_VERSION
1215

1316
echo "
1417
This script will run end-to-end tests for Feast Core and Batch Serving.
@@ -152,7 +155,7 @@ spring:
152155
password: password
153156
EOF
154157

155-
nohup java -jar core/target/feast-core-*${JAR_VERSION_SUFFIX}.jar \
158+
nohup java -jar core/target/feast-core-${FEAST_BUILD_VERSION}.jar \
156159
--spring.config.location=file:///tmp/core.application.yml \
157160
&> /var/log/feast-core.log &
158161
sleep 35
@@ -215,7 +218,7 @@ server:
215218
216219
EOF
217220

218-
nohup java -jar serving/target/feast-serving-*${JAR_VERSION_SUFFIX}.jar \
221+
nohup java -jar serving/target/feast-serving-${FEAST_BUILD_VERSION}.jar \
219222
--spring.config.location=file:///tmp/serving.warehouse.application.yml \
220223
&> /var/log/feast-serving-warehouse.log &
221224
sleep 15

‎infra/scripts/test-end-to-end-redis-cluster.sh‎

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,10 @@ test -z ${SKIP_BUILD_JARS} && SKIP_BUILD_JARS="false"
88
test -z ${GOOGLE_CLOUD_PROJECT} && GOOGLE_CLOUD_PROJECT="kf-feast"
99
test -z ${TEMP_BUCKET} && TEMP_BUCKET="feast-templocation-kf-feast"
1010
test -z ${JOBS_STAGING_LOCATION} && JOBS_STAGING_LOCATION="gs://${TEMP_BUCKET}/staging-location"
11-
test -z ${JAR_VERSION_SUFFIX} && JAR_VERSION_SUFFIX="-SNAPSHOT"
11+
12+
# Get the current build version using maven (and pom.xml)
13+
FEAST_BUILD_VERSION=$(mvn help:evaluate -Dexpression=project.version -q -DforceStdout)
14+
echo Building version: $FEAST_BUILD_VERSION
1215

1316
echo "
1417
This script will run end-to-end tests for Feast Core and Online Serving.
@@ -140,7 +143,7 @@ management:
140143
enabled: false
141144
EOF
142145

143-
nohup java -jar core/target/feast-core-*${JAR_VERSION_SUFFIX}.jar \
146+
nohup java -jar core/target/feast-core-${FEAST_BUILD_VERSION}.jar \
144147
--spring.config.location=file:///tmp/core.application.yml \
145148
&> /var/log/feast-core.log &
146149
sleep 35
@@ -210,7 +213,7 @@ spring:
210213
211214
EOF
212215

213-
nohup java -jar serving/target/feast-serving-*${JAR_VERSION_SUFFIX}.jar \
216+
nohup java -jar serving/target/feast-serving-${FEAST_BUILD_VERSION}.jar \
214217
--spring.config.location=file:///tmp/serving.online.application.yml \
215218
&> /var/log/feast-serving-online.log &
216219
sleep 15

‎infra/scripts/test-end-to-end.sh‎

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,10 @@ test -z ${SKIP_BUILD_JARS} && SKIP_BUILD_JARS="false"
88
test -z ${GOOGLE_CLOUD_PROJECT} && GOOGLE_CLOUD_PROJECT="kf-feast"
99
test -z ${TEMP_BUCKET} && TEMP_BUCKET="feast-templocation-kf-feast"
1010
test -z ${JOBS_STAGING_LOCATION} && JOBS_STAGING_LOCATION="gs://${TEMP_BUCKET}/staging-location"
11-
test -z ${JAR_VERSION_SUFFIX} && JAR_VERSION_SUFFIX="-SNAPSHOT"
11+
12+
# Get the current build version using maven (and pom.xml)
13+
FEAST_BUILD_VERSION=$(mvn help:evaluate -Dexpression=project.version -q -DforceStdout)
14+
echo Building version: $FEAST_BUILD_VERSION
1215

1316
echo "
1417
This script will run end-to-end tests for Feast Core and Online Serving.
@@ -136,7 +139,7 @@ spring:
136139
137140
EOF
138141

139-
nohup java -jar core/target/feast-core-*${JAR_VERSION_SUFFIX}.jar \
142+
nohup java -jar core/target/feast-core-$FEAST_BUILD_VERSION.jar \
140143
--spring.config.location=file:///tmp/core.application.yml \
141144
&> /var/log/feast-core.log &
142145
sleep 35
@@ -180,7 +183,7 @@ server:
180183
181184
EOF
182185

183-
nohup java -jar serving/target/feast-serving-*${JAR_VERSION_SUFFIX}.jar \
186+
nohup java -jar serving/target/feast-serving-${FEAST_BUILD_VERSION}.jar \
184187
--spring.config.location=file:///tmp/serving.online.application.yml \
185188
&> /var/log/feast-serving-online.log &
186189
sleep 15

0 commit comments

Comments
 (0)