From 879c48b0790c178f358a12de2ff537a5c64967b9 Mon Sep 17 00:00:00 2001
From: jianglai <jianglai@google.com>
Date: Tue, 4 Dec 2018 08:33:24 -0800
Subject: [PATCH] Use gradlew in Cloud Build

Also moved pushing tags to the private repo to the last step as we do not want
to tag the configs unless the build is successful.

-------------
Created by MOE: https://github.com/google/moe
MOE_MIGRATED_REVID=223982622
---
 .gcloudignore   |  1 -
 cloudbuild.yaml | 11 ++++++-----
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/.gcloudignore b/.gcloudignore
index a6a9f744c..5f328ec1f 100644
--- a/.gcloudignore
+++ b/.gcloudignore
@@ -4,4 +4,3 @@ bazel-*/**
 gradle/**/build/**
 gradle/**/WEB-INF/**
 gradle/.*/**
-gradle/gradle/**
diff --git a/cloudbuild.yaml b/cloudbuild.yaml
index b913a9a02..773d7e9e6 100644
--- a/cloudbuild.yaml
+++ b/cloudbuild.yaml
@@ -23,19 +23,20 @@ steps:
 - name: 'gcr.io/cloud-builders/git'
   args: ['tag', '$TAG_NAME']
   dir: 'nomulus-config'
-- name: 'gcr.io/cloud-builders/git'
-  args: ['push', 'origin', '$TAG_NAME']
-  dir: 'nomulus-config'
 - name: 'alpine'
   args: ['sh', '-c', 'cp -r nomulus-config/proxy/* java/google/registry/proxy/config/']
 # Build the deploy jar.
-- name: 'gradle:4.10.2'
-  args: ['gradle', 'testClasses', ':proxy:deployJar']
+- name: 'openjdk:8-slim'
+  args: ['./gradlew', 'testClasses', ':proxy:deployJar']
   dir: 'gradle'
 # Build the docker image.
 - name: 'gcr.io/cloud-builders/docker'
   args: ['build', '--tag', 'gcr.io/$PROJECT_ID/proxy:$TAG_NAME', '.']
   dir: 'gradle/proxy'
+# Push the tag to the private repo after a successful build.
+- name: 'gcr.io/cloud-builders/git'
+  args: ['push', 'origin', '$TAG_NAME']
+  dir: 'nomulus-config'
 # Images to upload to GCR.
 images: ['gcr.io/$PROJECT_ID/proxy:$TAG_NAME']
 timeout: 3600s