diff --git a/release/build_nomulus_for_env.sh b/release/build_nomulus_for_env.sh index 2f9cabb53d8..99d1c7390ca 100755 --- a/release/build_nomulus_for_env.sh +++ b/release/build_nomulus_for_env.sh @@ -27,7 +27,7 @@ fi environment="$1" dest="$2" -gcs_prefix="storage.googleapis.com/domain-registry-maven-repository" +gcs_prefix="gcs://domain-registry-maven-repository" # Let Gradle put its caches (dependency cache and build cache) in the source # tree. This allows sharing of the caches between steps in a Cloud Build @@ -42,8 +42,8 @@ then mkdir -p "${dest}" ./gradlew clean :core:buildToolImage \ - -PmavenUrl=https://"${gcs_prefix}"/maven \ - -PpluginsUrl=https://"${gcs_prefix}"/plugins + -PmavenUrl="${gcs_prefix}"/maven \ + -PpluginsUrl="${gcs_prefix}"/plugins mv core/build/libs/nomulus.jar "${dest}" else @@ -51,8 +51,8 @@ else mkdir -p "${dest}" ./gradlew clean stage -Penvironment="${environment}" \ - -PmavenUrl=https://"${gcs_prefix}"/maven \ - -PpluginsUrl=https://"${gcs_prefix}"/plugins + -PmavenUrl="${gcs_prefix}"/maven \ + -PpluginsUrl="${gcs_prefix}"/plugins for service in default pubapi backend tools do diff --git a/release/cloudbuild-nomulus.yaml b/release/cloudbuild-nomulus.yaml index c2377f975ce..2c6f7fe7219 100644 --- a/release/cloudbuild-nomulus.yaml +++ b/release/cloudbuild-nomulus.yaml @@ -27,8 +27,8 @@ steps: args: ['./gradlew', 'test', '-PskipDockerIncompatibleTests=true', - '-PmavenUrl=https://storage.googleapis.com/domain-registry-maven-repository/maven', - '-PpluginsUrl=https://storage.googleapis.com/domain-registry-maven-repository/plugins' + '-PmavenUrl=gcs://domain-registry-maven-repository/maven', + '-PpluginsUrl=gcs://domain-registry-maven-repository/plugins' ] # Build the tool binary and image. - name: 'gcr.io/${PROJECT_ID}/builder:latest' @@ -87,14 +87,14 @@ steps: set -e ./gradlew \ :db:publish \ - -PmavenUrl=https://storage.googleapis.com/domain-registry-maven-repository/maven \ - -PpluginsUrl=https://storage.googleapis.com/domain-registry-maven-repository/plugins \ + -PmavenUrl=gcs://domain-registry-maven-repository/maven \ + -PpluginsUrl=gcs://domain-registry-maven-repository/plugins \ -Ppublish_repo=gcs://${PROJECT_ID}-deployed-tags/maven \ -Pschema_version=${TAG_NAME} ./gradlew \ :core:publish \ - -PmavenUrl=https://storage.googleapis.com/domain-registry-maven-repository/maven \ - -PpluginsUrl=https://storage.googleapis.com/domain-registry-maven-repository/plugins \ + -PmavenUrl=gcs://domain-registry-maven-repository/maven \ + -PpluginsUrl=gcs://domain-registry-maven-repository/plugins \ -Ppublish_repo=gcs://${PROJECT_ID}-deployed-tags/maven \ -Pnomulus_version=${TAG_NAME} # Upload schema jar for use by schema deployment. diff --git a/release/cloudbuild-proxy.yaml b/release/cloudbuild-proxy.yaml index b15837066bc..b0a5763a51a 100644 --- a/release/cloudbuild-proxy.yaml +++ b/release/cloudbuild-proxy.yaml @@ -19,8 +19,8 @@ steps: - ./gradlew - :proxy:test - :proxy:buildProxyImage - - -PmavenUrl=https://storage.googleapis.com/domain-registry-maven-repository/maven - - -PpluginsUrl=https://storage.googleapis.com/domain-registry-maven-repository/plugins + - -PmavenUrl=gcs://domain-registry-maven-repository/maven + - -PpluginsUrl=gcs://domain-registry-maven-repository/plugins # Tag and push the image. We can't let Cloud Build's default processing do that for us # because we need to push the image before we can sign it in the following step. - name: 'gcr.io/${PROJECT_ID}/builder:latest'