diff options
Diffstat (limited to 'dist')
| -rwxr-xr-x | dist/release-vespa-rpm.sh | 48 | ||||
| -rw-r--r-- | dist/vespa.spec | 3 |
2 files changed, 15 insertions, 36 deletions
diff --git a/dist/release-vespa-rpm.sh b/dist/release-vespa-rpm.sh index dbd5565729c..c975e10dd1a 100755 --- a/dist/release-vespa-rpm.sh +++ b/dist/release-vespa-rpm.sh @@ -1,58 +1,38 @@ #!/bin/bash -# Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +# Copyright Verizon Media. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. + set -e -if [ $# -ne 2 ]; then +if [[ $# -ne 2 ]]; then echo "Usage: $0 <version> <git ref>" exit 1 fi +if [[ -z $COPR_WEBHOOK ]]; then + echo "This script requires the COPR_WEBHOOK environment variable to be set." + exit 1 +fi + readonly VERSION=$1 readonly GITREF=$2 -readonly DIST_DIR="dist" -readonly SPECFILE="${DIST_DIR}/vespa.spec" -readonly TITO_DIR="${DIST_DIR}/.tito" -readonly RPM_BRANCH="rpmbuild" +readonly RELEASE_TAG="v$VERSION" readonly CURRENT_BRANCH=$(git branch | grep "^\*" | cut -d' ' -f2) # Make sure we are up to date git checkout master git pull --rebase -# Update the VERSION file on master to be the next releasable version -echo "$VERSION" | awk -F. '{print $1"."($2+1)".0"}' > VERSION -git commit -am "Updating VERSION file to next releasable minor version." -for i in 1 2 3; do - if git push; then - break; - fi - git pull --rebase -done - -# Delete existing branch if exists and create new one -git push --delete origin $RPM_BRANCH &> /dev/null || true -git branch -D $RPM_BRANCH &> /dev/null || true -git checkout -b $RPM_BRANCH $GITREF - -# Tito expects spec file and .tito directory to be on root -git mv $TITO_DIR . -git mv $SPECFILE . - -# Hide pom.xml to avoid tito doing anything to our pom.xml files -mv pom.xml pom.xml.hide - -# Run tito to update spec file and tag -tito tag --use-version=$VERSION --no-auto-changelog +# Create a proper release tag -# Push changes and tag to branc -git push -u origin --follow-tags $RPM_BRANCH +git tag -a "$RELEASE_TAG" -m "Release version $VERSION" $GITREF +git push origin "$RELEASE_TAG" # Trig the build on Copr curl -X POST \ -H "Content-type: application/json" \ -H "X-GitHub-Event: create" \ - -d '{ "ref": "rpmbuild", "ref_type": "branch", "repository": { "clone_url": "https://github.com/vespa-engine/vespa.git" } }' \ - https://copr.fedorainfracloud.org/webhooks/github/8037/d1dd5867-b493-4647-a888-0c887e6087b3/ + -d '{ "ref": "$RELEASE_TAG", "ref_type": "tag", "repository": { "clone_url": "https://github.com/vespa-engine/vespa.git" } }' \ + "$COPR_WEBHOOK" git reset --hard HEAD git checkout $CURRENT_BRANCH diff --git a/dist/vespa.spec b/dist/vespa.spec index 5e3e1055b10..e45c45d41f9 100644 --- a/dist/vespa.spec +++ b/dist/vespa.spec @@ -712,6 +712,7 @@ fi %dir %{_prefix}/libexec %dir %{_prefix}/libexec/vespa %{_prefix}/libexec/vespa/common-env.sh +%{_prefix}/libexec/vespa/find-pid %{_prefix}/libexec/vespa/vespa-curl-wrapper %files base-libs @@ -795,7 +796,6 @@ fi %{_prefix}/lib/jars/bcprov-jdk15on-*.jar %{_prefix}/lib/jars/config-bundle-jar-with-dependencies.jar %{_prefix}/lib/jars/configdefinitions-jar-with-dependencies.jar -%{_prefix}/lib/jars/configgen.jar %{_prefix}/lib/jars/config-model-api-jar-with-dependencies.jar %{_prefix}/lib/jars/config-model-jar-with-dependencies.jar %{_prefix}/lib/jars/config-provisioning-jar-with-dependencies.jar @@ -803,7 +803,6 @@ fi %{_prefix}/lib/jars/container-disc-jar-with-dependencies.jar %{_prefix}/lib/jars/container-search-and-docproc-jar-with-dependencies.jar %{_prefix}/lib/jars/container-search-gui-jar-with-dependencies.jar -%{_prefix}/lib/jars/defaults-jar-with-dependencies.jar %{_prefix}/lib/jars/docprocs-jar-with-dependencies.jar %{_prefix}/lib/jars/flags-jar-with-dependencies.jar %{_prefix}/lib/jars/hk2-*.jar |