Merge remote-tracking branch 'og/trusted-ibm' into develop

.fossa.yml

@@ -28,3 +28,7 @@ analyze:
     type: mvn
     target: provider/indexer-gcp/pom.xml
     path: .
+  - name: indexer-ibm
+    type: mvn
+    target: provider/indexer-ibm/pom.xml
+    path: .

.gitlab-ci.yml

@@ -11,8 +11,25 @@ variables:
   GCP_DEPLOY_ENV: p4d
   GCP_DOMAIN: cloud.slb-ds.com
   GCP_STORAGE_URL: https://osdu-indexer-dot-opendes.appspot.com/api/storage/v2/
-
+  IBM_BUILD_SUBDIR: provider/indexer-ibm
+  IBM_INT_TEST_SUBDIR: testing/indexer-test-ibm
+  IBM_SKIP_BUILD: 'true'
+  IBM_SKIP_DEPLOY: 'true'
+  IBM_SKIP_TEST: 'false'
+  
 include:
-  - project: 'osdu/platform/ci-cd-pipelines'
-    ref: 'master'
-    file: 'temp-service.gitlab-ci.yml'
+  - project: "osdu/platform/ci-cd-pipelines"
+    ref: "ibm"
+    file: "standard-setup.yml"
+  - project: "osdu/platform/ci-cd-pipelines"
+    ref: "ibm"
+    file: "build/maven.yml"
+  - project: "osdu/platform/ci-cd-pipelines"
+    ref: "ibm"
+    file: "cloud-providers/ibm.yml"
+#   - project: "osdu/platform/ci-cd-pipelines"
+#     ref: "ibm"
+#     file: "scanners/fossa.yml"
+#   - project: "osdu/platform/ci-cd-pipelines"
+#     ref: "ibm"
+#     file: "scanners/gitlab-ultimate.yml"
\ No newline at end of file