resolving cherry-pick conflicts manually

.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"