From d9d9d944ce4391d7ec353571d77cbc024202f06a Mon Sep 17 00:00:00 2001
From: "Marc Burnie [AWS]" <mburnie@amazon.com>
Date: Fri, 7 Mar 2025 17:49:13 +0000
Subject: [PATCH] resolving cherry-pick conflicts manually
---
.gitlab-ci.yml | 20 ++++++++++++++++++--
1 file changed, 18 insertions(+), 2 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index ee45bbef8..6f5ce3a53 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -54,8 +54,24 @@ include:
file: "cloud-providers/core-global.yml"
ref: release/0.28
- - project: "osdu/platform/ci-cd-pipelines"
- file: "cloud-providers/aws-one-pipeline.yml"
+ - project: "osdu/platform/ci-cd-pipelines"
+ file: "cloud-providers/aws-one-pipeline.yml"
+ ref: release/0.28
+
+ - project: "osdu/platform/ci-cd-pipelines"
+ file: "cloud-providers/azure-one-pipeline.yml"
+ ref: release/0.28
+
+ - project: "osdu/platform/ci-cd-pipelines"
+ file: "cloud-providers/gc-one-pipeline.yml"
+ ref: release/0.28
+
+ - project: "osdu/platform/ci-cd-pipelines"
+ file: "cloud-providers/ibm-one-pipeline.yml"
+ ref: release/0.28
+
+ # aws
+ - local: "devops/aws/pipeline/override-stages.yml"
- local: "devops/gc/pipeline/override-stages.yml"
--
GitLab