From 779082216275718a2ba7118cf42fb2fbdeb24361 Mon Sep 17 00:00:00 2001 From: reesercollins <10563996+reesercollins@users.noreply.github.com> Date: Mon, 25 Jul 2022 14:17:44 -0400 Subject: [PATCH 1/2] Use new build agent --- cccs-build/superset-base/azure-pipelines.yml | 7 +++---- cccs-build/superset/azure-pipelines.yml | 3 +-- 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/cccs-build/superset-base/azure-pipelines.yml b/cccs-build/superset-base/azure-pipelines.yml index a34286963b8ea..2ba2f1b7d8748 100644 --- a/cccs-build/superset-base/azure-pipelines.yml +++ b/cccs-build/superset-base/azure-pipelines.yml @@ -12,8 +12,7 @@ variables: buildTimestamp: $[format('{0:yyyyMMddHHmmss}', pipeline.startTime)] DOCKER_BUILDKIT: 1 -pool: - vmImage: ubuntu-latest +pool: "cauldron-vmss" steps: - bash: | @@ -32,7 +31,7 @@ steps: - task: Docker@2 displayName: Build image inputs: - command: 'build' + command: "build" repository: $(imageRepository) arguments: --progress=plain dockerfile: $(dockerfile) @@ -42,7 +41,7 @@ steps: - task: Docker@2 displayName: Push image inputs: - command: 'push' + command: "push" repository: $(imageRepository) tags: | $(BRANCH_NAME) diff --git a/cccs-build/superset/azure-pipelines.yml b/cccs-build/superset/azure-pipelines.yml index fd10d0ce527a5..c122e2788a033 100644 --- a/cccs-build/superset/azure-pipelines.yml +++ b/cccs-build/superset/azure-pipelines.yml @@ -11,8 +11,7 @@ variables: buildTimestamp: $[format('{0:yyyyMMddHHmmss}', pipeline.startTime)] DOCKER_BUILDKIT: 1 -pool: - vmImage: ubuntu-latest +pool: "cauldron-vmss" steps: - bash: | From d0cb9e61fc87710c3e093e6a028185b4e173336f Mon Sep 17 00:00:00 2001 From: reesercollins <10563996+reesercollins@users.noreply.github.com> Date: Mon, 25 Jul 2022 14:31:05 -0400 Subject: [PATCH 2/2] Remove quotes --- cccs-build/superset-base/azure-pipelines.yml | 4 ++-- cccs-build/superset/azure-pipelines.yml | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/cccs-build/superset-base/azure-pipelines.yml b/cccs-build/superset-base/azure-pipelines.yml index 2ba2f1b7d8748..e97febdbbde4d 100644 --- a/cccs-build/superset-base/azure-pipelines.yml +++ b/cccs-build/superset-base/azure-pipelines.yml @@ -12,7 +12,7 @@ variables: buildTimestamp: $[format('{0:yyyyMMddHHmmss}', pipeline.startTime)] DOCKER_BUILDKIT: 1 -pool: "cauldron-vmss" +pool: cauldron-vmss steps: - bash: | @@ -31,7 +31,7 @@ steps: - task: Docker@2 displayName: Build image inputs: - command: "build" + command: build repository: $(imageRepository) arguments: --progress=plain dockerfile: $(dockerfile) diff --git a/cccs-build/superset/azure-pipelines.yml b/cccs-build/superset/azure-pipelines.yml index c122e2788a033..7e0e97feb1812 100644 --- a/cccs-build/superset/azure-pipelines.yml +++ b/cccs-build/superset/azure-pipelines.yml @@ -11,7 +11,7 @@ variables: buildTimestamp: $[format('{0:yyyyMMddHHmmss}', pipeline.startTime)] DOCKER_BUILDKIT: 1 -pool: "cauldron-vmss" +pool: cauldron-vmss steps: - bash: |