diff options
| author | Arnstein Ressem <aressem@verizonmedia.com> | 2023-06-05 17:05:45 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-06-05 17:05:45 +0200 |
| commit | 09681c16e329363855023884a6c706e7bd3b5622 (patch) | |
| tree | df7a88163d49b71e7bfc87d6ff116e49f6466761 | |
| parent | 3165cf8fac3ef3bb3b8c4bc933aa6d74f38db565 (diff) | |
| parent | 4e4e7c19417eb04ecf1cc7c4a1b096b5c3eda3b6 (diff) | |
Merge pull request #27290 from vespa-engine/aressem/fix-opensource-release-test
Get release date from metadata. Check for released file and not dir a…
| -rw-r--r-- | screwdriver.yaml | 7 | ||||
| -rwxr-xr-x | screwdriver/release-java-artifacts.sh | 2 |
2 files changed, 4 insertions, 5 deletions
diff --git a/screwdriver.yaml b/screwdriver.yaml index 8be255eb728..81fe8d75c22 100644 --- a/screwdriver.yaml +++ b/screwdriver.yaml @@ -443,8 +443,8 @@ jobs: now_epoch=`date "+%s"` echo "Now epoch: " $now_epoch - calculate-current-release-age: | - current_release_date=`curl -s 'https://repo1.maven.org/maven2/com/yahoo/vespa/parent/' | \ - grep '^<a href="[0-9]' | awk '{print $4}' | sort | tail -1` + current_release_date=$(curl -sLf https://repo1.maven.org/maven2/com/yahoo/vespa/cloud-tenant-base/maven-metadata.xml | \ + grep -oP "<lastUpdated>\K\w+" | cut -c 1-8) echo "Current release date: " $current_release_date current_release_epoch=`date -d "$current_release_date" "+%s"` echo "Current release epoch: " $current_release_epoch @@ -456,8 +456,7 @@ jobs: exit 1 fi - calculate-docker-image-age: | - image_date=`curl https://hub.docker.com/v2/repositories/vespaengine/vespa/ | \ - python -m json.tool| grep last_updated | awk '{print $2}' | tr -d '",'` + image_date=$(curl -sLf https://hub.docker.com/v2/repositories/vespaengine/vespa/ | jq -re '.last_updated') echo "Docker image last_updated: " $image_date image_epoch=`date -d "$image_date" "+%s"` echo "Docker image epoch: " $image_epoch diff --git a/screwdriver/release-java-artifacts.sh b/screwdriver/release-java-artifacts.sh index e8e98015d39..8cf61dfc839 100755 --- a/screwdriver/release-java-artifacts.sh +++ b/screwdriver/release-java-artifacts.sh @@ -16,7 +16,7 @@ fi readonly VESPA_RELEASE="$1" readonly VESPA_REF="$2" -QUERY_VERSION_HTTP_CODE=$(curl --write-out %{http_code} --silent --location --output /dev/null https://oss.sonatype.org/content/repositories/releases/com/yahoo/vespa/parent/${VESPA_RELEASE}/) +QUERY_VERSION_HTTP_CODE=$(curl --write-out %{http_code} --silent --location --output /dev/null https://oss.sonatype.org/content/repositories/releases/com/yahoo/vespa/parent/${VESPA_RELEASE}/parent-${VESPA_RELEASE}.pom) if [[ "200" == $QUERY_VERSION_HTTP_CODE ]]; then echo "Vespa version $VESPA_RELEASE is already promoted, exiting" exit 0 |