From 8557ac107c17aae6c8a2012e5729a7d6b4f428b3 Mon Sep 17 00:00:00 2001
From: Daniel Scholl <dascholl@microsoft.com>
Date: Tue, 26 May 2020 09:20:04 -0500
Subject: [PATCH] Set azure builds back to master branch
---
.gitlab-ci.yml | 18 ++++++++----------
1 file changed, 8 insertions(+), 10 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 45f5172ad..74745904f 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -18,21 +18,19 @@ variables:
include:
- project: "osdu/platform/ci-cd-pipelines"
- ref: "master"
file: "standard-setup.yml"
- project: "osdu/platform/ci-cd-pipelines"
- ref: "master"
file: "build/maven.yml"
- project: "osdu/platform/ci-cd-pipelines"
- ref: "trusted-azure"
+ ref: "master"
file: "cloud-providers/azure.yml"
- # - project: 'osdu/platform/ci-cd-pipelines'
- # ref: "master"
- # file: 'cloud-providers/gcp.yml'
- # - project: "osdu/platform/ci-cd-pipelines"
- # file: "scanners/fossa.yml"
- # - project: "osdu/platform/ci-cd-pipelines"
- # file: "scanners/gitlab-ultimate.yml"
+ - project: 'osdu/platform/ci-cd-pipelines'
+ ref: "master"
+ file: 'cloud-providers/gcp.yml'
+ - project: "osdu/platform/ci-cd-pipelines"
+ file: "scanners/fossa.yml"
+ - project: "osdu/platform/ci-cd-pipelines"
+ file: "scanners/gitlab-ultimate.yml"
compile-and-unit-test:
--
GitLab