From e94738b27e38ec72b49efaf0ad666c928dc3c908 Mon Sep 17 00:00:00 2001
From: Arnstein Ressem <aressem@yahooinc.com>
Date: Thu, 29 Dec 2022 14:03:55 +0100
Subject: Compile sample apps in component build.

---
 screwdriver.yaml | 14 +++++++++++---
 1 file changed, 11 insertions(+), 3 deletions(-)

diff --git a/screwdriver.yaml b/screwdriver.yaml
index 9f9a388477a..f888e99b0e7 100644
--- a/screwdriver.yaml
+++ b/screwdriver.yaml
@@ -101,11 +101,15 @@ jobs:
       CCACHE_COMPRESS: "1"
     secrets:
       - DOCKER_HUB_DEPLOY_KEY
+    requires: [~pr]
     steps:
       - get-vespa-version: |
-          VESPA_VERSION=$(meta get vespa.version)
-          VESPA_REF=$(meta get vespa.ref)
-          SYSTEM_TEST_REF=$(meta get system-test.ref)
+          #VESPA_VERSION=$(meta get vespa.version)
+          #VESPA_REF=$(meta get vespa.ref)
+          #SYSTEM_TEST_REF=$(meta get system-test.ref)
+          VESPA_VERSION="8.103.38"
+          VESPA_REF="b8acefb1ba14ab159435e02760d9a90a6f1501ef"
+          SYSTEM_TEST_REF="14a6a5742375b5b13fef88733a211ae212dc9ac3"
 
           if [[ $VESPA_VERSION == null ]] || [[ $VESPA_REF == null ]] || [[ $SYSTEM_TEST_REF == null ]]; then
             echo "Must have valid Vespa version and reference to continue \
@@ -124,8 +128,10 @@ jobs:
           (cd vespa && git checkout $VESPA_REF && git tag v$VESPA_VERSION)
           git clone -q https://github.com/vespa-engine/system-test
           (cd system-test && git checkout $SYSTEM_TEST_REF)
+          git clone -q https://github.com/vespa-engine/sample-apps
           # Set correct version in pom.xml files
           (cd vespa && screwdriver/replace-vespa-version-in-poms.sh $VESPA_VERSION $(pwd) )
+          (cd sample-apps && find . -name "pom.xml" -exec sed -i -e "s,<vespa_version>.*</vespa_version>,<vespa_version>$VESPA_VERSION</vespa_version>," {} \;)
       - make-srpm: |
           make -C $WORKDIR/vespa -f .copr/Makefile srpm outdir=$WORKDIR
       - *restore-cache
@@ -142,6 +148,8 @@ jobs:
           time ctest3 --output-on-failure -j ${NUM_THREADS}
           ccache --show-stats
           time make -j ${NUM_THREADS} install DESTDIR=$WORKDIR/vespa-install
+      - build-sample-apps: |
+          (cd sample-apps && time mvn -T $NUM_THREADS $VESPA_MAVEN_EXTRA_OPTS package)
       - verify-rpm-build: |
           cd $WORKDIR
           ulimit -c 0
-- 
cgit v1.2.3


From c638354600d4121495e31019b86c7d37388f4dc9 Mon Sep 17 00:00:00 2001
From: Arnstein Ressem <aressem@yahooinc.com>
Date: Thu, 29 Dec 2022 14:46:33 +0100
Subject: cd to correct dir.

---
 screwdriver.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/screwdriver.yaml b/screwdriver.yaml
index f888e99b0e7..ccb3e293beb 100644
--- a/screwdriver.yaml
+++ b/screwdriver.yaml
@@ -149,7 +149,7 @@ jobs:
           ccache --show-stats
           time make -j ${NUM_THREADS} install DESTDIR=$WORKDIR/vespa-install
       - build-sample-apps: |
-          (cd sample-apps && time mvn -T $NUM_THREADS $VESPA_MAVEN_EXTRA_OPTS package)
+          (cd $WORKDIR/sample-apps && time mvn -T $NUM_THREADS $VESPA_MAVEN_EXTRA_OPTS package)
       - verify-rpm-build: |
           cd $WORKDIR
           ulimit -c 0
-- 
cgit v1.2.3


From 4402a1c28cc6f9d7314fcacc22682427662bd12b Mon Sep 17 00:00:00 2001
From: Arnstein Ressem <aressem@yahooinc.com>
Date: Fri, 30 Dec 2022 10:19:11 +0100
Subject: Remove fixed refs and pr build.

---
 screwdriver.yaml | 10 +++-------
 1 file changed, 3 insertions(+), 7 deletions(-)

diff --git a/screwdriver.yaml b/screwdriver.yaml
index ccb3e293beb..182abb95968 100644
--- a/screwdriver.yaml
+++ b/screwdriver.yaml
@@ -101,15 +101,11 @@ jobs:
       CCACHE_COMPRESS: "1"
     secrets:
       - DOCKER_HUB_DEPLOY_KEY
-    requires: [~pr]
     steps:
       - get-vespa-version: |
-          #VESPA_VERSION=$(meta get vespa.version)
-          #VESPA_REF=$(meta get vespa.ref)
-          #SYSTEM_TEST_REF=$(meta get system-test.ref)
-          VESPA_VERSION="8.103.38"
-          VESPA_REF="b8acefb1ba14ab159435e02760d9a90a6f1501ef"
-          SYSTEM_TEST_REF="14a6a5742375b5b13fef88733a211ae212dc9ac3"
+          VESPA_VERSION=$(meta get vespa.version)
+          VESPA_REF=$(meta get vespa.ref)
+          SYSTEM_TEST_REF=$(meta get system-test.ref)
 
           if [[ $VESPA_VERSION == null ]] || [[ $VESPA_REF == null ]] || [[ $SYSTEM_TEST_REF == null ]]; then
             echo "Must have valid Vespa version and reference to continue \
-- 
cgit v1.2.3