diff options
| author | Arnstein Ressem <aressem@yahooinc.com> | 2023-10-27 12:38:19 +0200 |
|---|---|---|
| committer | Arnstein Ressem <aressem@yahooinc.com> | 2023-10-27 12:38:19 +0200 |
| commit | 50eb39804a5c0cf57a556416f97d0fe8e3d7e04d (patch) | |
| tree | e5a6ad3c1f759e44180926f70f68d629bf157455 /screwdriver.yaml | |
| parent | e54967416665e6ff7a1031ebd6f50aa596a6e3a7 (diff) | |
Reorder checkout and set vespa version for PR builds.
Diffstat (limited to 'screwdriver.yaml')
| -rw-r--r-- | screwdriver.yaml | 35 |
1 files changed, 18 insertions, 17 deletions
diff --git a/screwdriver.yaml b/screwdriver.yaml index 3c0af4a7579..29b807cba44 100644 --- a/screwdriver.yaml +++ b/screwdriver.yaml @@ -118,28 +118,29 @@ jobs: (got VESPA_VERSION=$VESPA_VERSION, VESPA_REF=$VESPA_REF, SYSTEM_TEST_REF=$SYSTEM_TEST_REF)." exit 1 fi - meta set vespa.version $VESPA_VERSION + else + # We'll just use the version number from the latest factory build for PRs + VESPA_VERSION=$(meta get vespa.version --external component-build) fi + meta set vespa.version $VESPA_VERSION - checkout: | - mkdir -p workdir - cd workdir - WORKDIR=$(pwd) + WORKDIR=$(pwd)/.. + cd $WORKDIR + + git clone -q --depth 1 https://github.com/vespa-engine/system-test + git clone -q --depth 1 https://github.com/vespa-engine/sample-apps + if [[ -z "$SD_PULL_REQUEST" ]]; then - git clone -q https://github.com/vespa-engine/vespa - (cd vespa && git checkout $VESPA_REF && git tag v$VESPA_VERSION) - git clone -q https://github.com/vespa-engine/system-test + (cd vespa && git checkout $VESPA_REF) (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>," {} \;) - (cd sample-apps && find . -name "pom.xml" -exec sed -i -e "s:<version>[[]8,9[)]</version>:<version>$VESPA_VERSION</version>:" {} \;) - else - mkdir -p $WORKDIR/vespa - (cd $SD_SOURCE_DIR && git archive HEAD --format tar) | tar x -C $WORKDIR/vespa - git clone -q --depth 1 https://github.com/vespa-engine/system-test - git clone -q --depth 1 https://github.com/vespa-engine/sample-apps fi + + # We set the tag locally to make the SRPM build like Copr does it + (cd vespa && git tag v$VESPA_VERSION) + # 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>," {} \;) + (cd sample-apps && find . -name "pom.xml" -exec sed -i -e "s:<version>[[]8,9[)]</version>:<version>$VESPA_VERSION</version>:" {} \;) - make-srpm: | $SD_SOURCE_DIR/screwdriver/factory-command.sh update-build-status running "Building" |