From 4eb1cd592da87ca9bb7f3f04ecbb9b7b81273f65 Mon Sep 17 00:00:00 2001
From: mmuller <mmuller@google.com>
Date: Wed, 3 Apr 2019 07:59:52 -0700
Subject: [PATCH] Make cloud build of nomulus use the GCS repo.

Also change comments to cover a few ambiguous points.

-------------
Created by MOE: https://github.com/google/moe
MOE_MIGRATED_REVID=241731091
---
 cloudbuild-nomulus.yaml | 11 +++++++++--
 cloudbuild-proxy.yaml   |  4 ++++
 2 files changed, 13 insertions(+), 2 deletions(-)

diff --git a/cloudbuild-nomulus.yaml b/cloudbuild-nomulus.yaml
index 9fc3ad60a..759120da5 100644
--- a/cloudbuild-nomulus.yaml
+++ b/cloudbuild-nomulus.yaml
@@ -1,8 +1,11 @@
 # To run the build locally, install cloud-build-local first.
 # See: https://cloud.google.com/cloud-build/docs/build-debug-locally
-# Then run:
+# You will need access to a private registry, so be sure to install the docker
+# credential helper.
+# Then, in the root of a nomulus source tree, run:
 # cloud-build-local --config=cloudbuild-nomulus.yaml --dryrun=false --substitutions TAG_NAME=[TAG] .
-# This will create a docker image named gcr.io/[PROJECT_ID]/proxy:[TAG] locally.
+# This will build the contents of the current directory and generate the
+# nomulus war-files locally.
 # The PROJECT_ID is the current project name that gcloud uses.
 # You can add "--push true" to have the image pushed to GCR.
 #
@@ -33,6 +36,8 @@ steps:
     - '-x'
     - 'autoLintGradle'
     - '-Penvironment=sandbox'
+    - '-PmavenUrl=gcs://domain-registry-maven-repository/maven'
+    - '-PpluginsUrl=gcs://domain-registry-maven-repository/plugins'
   dir: 'gradle'
 - name: 'alpine'
   args: ['sh', './move_artifacts.sh', 'sandbox', 'nomulus']
@@ -44,6 +49,8 @@ steps:
     - '-x'
     - 'autoLintGradle'
     - '-Penvironment=alpha'
+    - '-PmavenUrl=gcs://domain-registry-maven-repository/maven'
+    - '-PpluginsUrl=gcs://domain-registry-maven-repository/plugins'
   dir: 'gradle'
 - name: 'alpine'
   args: ['sh', './move_artifacts.sh', 'alpha', 'nomulus']
diff --git a/cloudbuild-proxy.yaml b/cloudbuild-proxy.yaml
index 113acfc0b..c6a668a65 100644
--- a/cloudbuild-proxy.yaml
+++ b/cloudbuild-proxy.yaml
@@ -1,4 +1,6 @@
 # To run the build locally, install cloud-build-local first.
+# You will need access to a private registry, so be sure to install the docker
+# credential helper.
 # See: https://cloud.google.com/cloud-build/docs/build-debug-locally
 # Then run:
 # cloud-build-local --config=cloudbuild-proxy.yaml --dryrun=false --substitutions TAG_NAME=[TAG] .
@@ -29,6 +31,8 @@ steps:
     - ':proxy:deployJar'
     - '-x'
     - 'autoLintGradle'
+    - '-PmavenUrl=gcs://domain-registry-maven-repository/maven'
+    - '-PpluginsUrl=gcs://domain-registry-maven-repository/plugins'
   dir: 'gradle'
 # Build the docker image.
 - name: 'gcr.io/cloud-builders/docker'