diff options
| author | Arnstein Ressem <aressem@gmail.com> | 2022-03-30 22:38:22 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-03-30 22:38:22 +0200 |
| commit | 9a95cab7c0ea220cff9bd1100049d4661f186d4d (patch) | |
| tree | 9a4816d88dbe41c73b8ac653c3751cc76e4c4d03 /screwdriver | |
| parent | 2b41f287fbaa2b26a50205599a186526816bd3e8 (diff) | |
Revert "Revert back to CentOS 7 for open source releasing for now."
Diffstat (limited to 'screwdriver')
| -rwxr-xr-x | screwdriver/release-java-artifacts.sh | 6 | ||||
| -rwxr-xr-x | screwdriver/release-rpms.sh | 4 |
2 files changed, 6 insertions, 4 deletions
diff --git a/screwdriver/release-java-artifacts.sh b/screwdriver/release-java-artifacts.sh index 3efa4360266..ed0a9f25824 100755 --- a/screwdriver/release-java-artifacts.sh +++ b/screwdriver/release-java-artifacts.sh @@ -31,8 +31,10 @@ cd $VESPA_DIR git checkout $VESPA_REF mkdir -p $SD_SOURCE_DIR/screwdriver/deploy -openssl aes-256-cbc -pass pass:$GPG_ENCPHRASE -in $SD_SOURCE_DIR/screwdriver/pubring.gpg.enc -out $SD_SOURCE_DIR/screwdriver/deploy/pubring.gpg -d -openssl aes-256-cbc -pass pass:$GPG_ENCPHRASE -in $SD_SOURCE_DIR/screwdriver/secring.gpg.enc -out $SD_SOURCE_DIR/screwdriver/deploy/secring.gpg -d +openssl aes-256-cbc -md md5 -pass pass:$GPG_ENCPHRASE -in $SD_SOURCE_DIR/screwdriver/pubring.gpg.enc -out $SD_SOURCE_DIR/screwdriver/deploy/pubring.gpg -d +openssl aes-256-cbc -md md5 -pass pass:$GPG_ENCPHRASE -in $SD_SOURCE_DIR/screwdriver/secring.gpg.enc -out $SD_SOURCE_DIR/screwdriver/deploy/secring.gpg -d +export GPG_TTY=$(tty) +export TERM=xterm # Build the Java code with the correct version set find . -name "pom.xml" -exec sed -i'' -e "s,<version>.*SNAPSHOT.*</version>,<version>$VESPA_RELEASE</version>," \ diff --git a/screwdriver/release-rpms.sh b/screwdriver/release-rpms.sh index 3346e0bef35..57040541695 100755 --- a/screwdriver/release-rpms.sh +++ b/screwdriver/release-rpms.sh @@ -12,7 +12,7 @@ fi readonly VESPA_RELEASE="$1" readonly VESPA_REF="$2" -VESPA_RPM=$(repoquery --repofrompath=vespa,https://copr-be.cloud.fedoraproject.org/results/@vespa/vespa/epel-7-x86_64 --repoid=vespa -q vespa | cut -d: -f2 | cut -d- -f1) +VESPA_RPM=$(dnf repoquery --repofrompath=vespa,https://copr-be.cloud.fedoraproject.org/results/@vespa/vespa/epel-7-x86_64 --repoid=vespa -q vespa | tail -1 | cut -d: -f2 | cut -d- -f1) echo "Latest RPM on Copr: $VESPA_RPM" if [ "$VESPA_RELEASE" == "$VESPA_RPM" ]; then @@ -32,7 +32,7 @@ cd vespa dist/release-vespa-rpm.sh $VESPA_RELEASE $VESPA_REF while [ "$VESPA_RELEASE" != "$VESPA_RPM" ]; do - VESPA_RPM=$(repoquery --repofrompath=vespa,https://copr-be.cloud.fedoraproject.org/results/@vespa/vespa/epel-7-x86_64 --repoid=vespa -q vespa | cut -d: -f2 | cut -d- -f1) + VESPA_RPM=$(dnf repoquery --repofrompath=vespa,https://copr-be.cloud.fedoraproject.org/results/@vespa/vespa/epel-7-x86_64 --repoid=vespa -q vespa | tail -1 | cut -d: -f2 | cut -d- -f1) echo "RPM: $VESPA_RPM" sleep 150 done |