From 8f614dc9cf04142f20002c0dcd2667ec0684cd70 Mon Sep 17 00:00:00 2001 From: Arnstein Ressem Date: Fri, 28 Jul 2023 12:01:48 +0200 Subject: Revert "Revert "Remove oss release workaround."" --- screwdriver/release-java-artifacts.sh | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) (limited to 'screwdriver/release-java-artifacts.sh') diff --git a/screwdriver/release-java-artifacts.sh b/screwdriver/release-java-artifacts.sh index f8491571d23..cb892b86e80 100755 --- a/screwdriver/release-java-artifacts.sh +++ b/screwdriver/release-java-artifacts.sh @@ -30,10 +30,6 @@ git clone https://github.com/vespa-engine/vespa.git $VESPA_DIR cd $VESPA_DIR git checkout $VESPA_REF -#TODO(aressem): Remove after validation -patch -p1 < $SD_SOURCE_DIR/screwdriver/move-ossrh-deploy-profile.patch - - mkdir -p $SD_SOURCE_DIR/screwdriver/deploy # gpg-agent in RHEL 8 runs out of memory if we use Maven and sign in parallel. Add option to overcome this. echo "auto-expand-secmem" >> $SD_SOURCE_DIR/screwdriver/deploy/gpg-agent.conf @@ -65,7 +61,7 @@ export FACTORY_VESPA_VERSION=$VESPA_RELEASE COMMON_MAVEN_OPTS="$VESPA_MAVEN_EXTRA_OPTS --no-snapshot-updates --settings $(pwd)/screwdriver/settings-publish.xml --activate-profiles ossrh-deploy-vespa -DskipTests" TMPFILE=$(mktemp) -mvn -X $COMMON_MAVEN_OPTS -pl :dependency-versions -DskipStagingRepositoryClose=true deploy 2>&1 | tee $TMPFILE +mvn $COMMON_MAVEN_OPTS -pl :dependency-versions -DskipStagingRepositoryClose=true deploy 2>&1 | tee $TMPFILE # Find the stage repo name STG_REPO=$(cat $TMPFILE | grep 'Staging repository at http' | head -1 | awk -F/ '{print $NF}') -- cgit v1.2.3