Merge pull request #97 from data-catering/bugfix/benchmark-scripts

Fix finding example jar and correct version

Author: pflooky

.github/workflows/benchmark.yml

@@ -18,7 +18,7 @@ jobs:
           fetch-depth: 2
       - name: Check if benchmark has already run
         run: |
-          version=$(grep dataCatererVersion gradle.properties | cut -d= -f2)
+          version=$(grep dataCatererVersion ../gradle.properties | cut -d= -f2)
           if [ ! -f benchmark/results/benchmark_results_${version}.txt ]; then
               echo "No benchmark results for version: $version, starting to run benchmarks"
           else
@@ -34,10 +34,8 @@ jobs:
       - name: Get Spark query engine jars
         run: bash benchmark/setup_query_engine_jars.sh
       - name: Run benchmark script
-        env:
-          DATA_CATERER_MANAGEMENT_TRACK: ${{ secrets.DATA_CATERER_MANAGEMENT_TRACK }}
         run: |
-          version=$(grep dataCatererVersion gradle.properties | cut -d= -f2)
+          version=$(grep dataCatererVersion ../gradle.properties | cut -d= -f2)
           bash benchmark/run_benchmark.sh
           bash benchmark/compare_benchmark_results.sh "$version"
       - name: Create pull request

example/benchmark/run_benchmark.sh

@@ -63,7 +63,7 @@ run_docker() {
 
     time_taken=$({
       time -p docker run -p 4040:4040 \
-        -v "${EXAMPLE_DIR}/build/libs/data-caterer-example-0.1.0.jar:/opt/app/job.jar" \
+        -v "${JOB_JAR}:/opt/app/job.jar" \
         -v "${EXAMPLE_DIR}/benchmark/jars/blaze.jar:/opt/app/jars/blaze.jar" \
         -v "${EXAMPLE_DIR}/benchmark/jars/comet.jar:/opt/app/jars/comet.jar" \
         -v "${EXAMPLE_DIR}/benchmark/jars/gluten.jar:/opt/app/jars/gluten.jar" \
@@ -94,6 +94,15 @@ if [[ $? -ne 0 ]]; then
   exit 1
 fi
 
+  # Resolve the latest non-sources/non-javadoc jar produced by the example project
+  JOB_JAR=$(ls -t "${EXAMPLE_DIR}/build/libs"/*.jar 2>/dev/null | grep -v -E "(sources|javadoc)" | head -1)
+  if [[ -z "$JOB_JAR" || ! -f "$JOB_JAR" ]]; then
+    echo "Could not locate built job jar under ${EXAMPLE_DIR}/build/libs. Ensure the build produced a jar."
+    ls -al "${EXAMPLE_DIR}/build/libs" || true
+    exit 1
+  fi
+  echo "Using job jar: $JOB_JAR"
+
 echo "Pulling image before starting benchmarks"
 docker pull datacatering/data-caterer:"$data_caterer_version"