fix ACR build logs (#319)

* suppress ACR builds logs due to Azure/azure-cli#6408 * update aks client image, use --no-format in ACR build
hmcts · Oct 5, 2018 · a8309a4 · a8309a4
1 parent 195b681
commit a8309a4
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 4 deletions.
diff --git a/src/uk/gov/hmcts/contino/azure/Acr.groovy b/src/uk/gov/hmcts/contino/azure/Acr.groovy
@@ -59,7 +59,7 @@ class Acr extends Az {
    *   stdout of the step
    */
   def build(DockerImage dockerImage) {
-    this.az "acr build -r ${registryName} -t ${dockerImage.getShortName()} -g ${resourceGroup} ."
+    this.az "acr build --no-format -r ${registryName} -t ${dockerImage.getShortName()} -g ${resourceGroup} ."
   }
 
   /**

diff --git a/test/uk/gov/hmcts/contino/azure/AcrTest.groovy b/test/uk/gov/hmcts/contino/azure/AcrTest.groovy
@@ -50,7 +50,7 @@ class AcrTest extends Specification {
 
     then:
       1 * steps.sh({it.containsKey('script') &&
-                    it.get('script').contains("az acr build -r ${REGISTRY_NAME} -t ${IMAGE_NAME} -g ${REGISTRY_RESOURCE_GROUP} .") &&
+                    it.get('script').contains("az acr build --no-format -r ${REGISTRY_NAME} -t ${IMAGE_NAME} -g ${REGISTRY_RESOURCE_GROUP} .") &&
                     it.containsKey('returnStdout') &&
                     it.get('returnStdout').equals(true)})
   }

diff --git a/vars/sectionCI.groovy b/vars/sectionCI.groovy
@@ -70,7 +70,7 @@ def call(params) {
   Builder builder = pipelineType.builder
 
   if (pl.dockerBuild) {
-    withDocker('hmcts/cnp-aks-client:az-2.0.45-kubectl-1.11.2', null) {
+    withDocker('hmcts/cnp-aks-client:az-2.0.46-kubectl-1.11.2', null) {
       withSubscription(subscription) {
         withRegistrySecrets {
           def acr = new Acr(this, subscription, env.REGISTRY_NAME, env.REGISTRY_RESOURCE_GROUP)
@@ -94,7 +94,7 @@ def call(params) {
 
                       aksUrl = aksDeploy(dockerImage, params)
                       log.info("deployed component URL: ${aksUrl}")
-                      
+
                       githubUpdateDeploymentStatus(deploymentNumber, aksUrl)
                     }
                   }