From ad3bd8bd7a4c91409b7b545a347a0065efde7c53 Mon Sep 17 00:00:00 2001 From: Aman Verma Date: Thu, 10 Sep 2020 01:16:04 +0530 Subject: [PATCH 01/12] adding helm charts --- .fossa.yml | 4 + .gitlab-ci.yml | 10 +- devops/azure/README.md | 3 + devops/azure/chart/Chart.yaml | 20 ++++ devops/azure/chart/templates/deployment.yaml | 114 +++++++++++++++++++ devops/azure/chart/templates/service.yaml | 27 +++++ devops/azure/chart/values.yaml | 23 ++++ provider/schema-azure/Dockerfile | 4 + 8 files changed, 203 insertions(+), 2 deletions(-) create mode 100644 devops/azure/README.md create mode 100644 devops/azure/chart/Chart.yaml create mode 100644 devops/azure/chart/templates/deployment.yaml create mode 100644 devops/azure/chart/templates/service.yaml create mode 100644 devops/azure/chart/values.yaml create mode 100644 provider/schema-azure/Dockerfile diff --git a/.fossa.yml b/.fossa.yml index 8c45fafa..7e3c71b3 100644 --- a/.fossa.yml +++ b/.fossa.yml @@ -20,3 +20,7 @@ analyze: type: mvn target: provider/schema-gcp/pom.xml path: . + - name: os-schema-azure + type: mvn + target: provider/schema-azure/pom.xml + path: . diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 9a1ef953..2f336eed 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -12,6 +12,12 @@ variables: IBM_INT_TEST_SUBDIR: testing/schema-test-core IBM_TEST_CMD: verify + AZURE_SERVICE: schema + AZURE_BUILD_SUBDIR: provider/schema-azure + AZURE_TEST_SUBDIR: testing/schema-test-core + AZURE_SKIP_TEST: 'true' + + include: - project: "osdu/platform/ci-cd-pipelines" file: "standard-setup.yml" @@ -34,5 +40,5 @@ include: # - project: "osdu/platform/ci-cd-pipelines" # file: "scanners/gitlab-ultimate.yml" - # - project: "osdu/platform/ci-cd-pipelines" - # file: "cloud-providers/azure.yml" + - project: "osdu/platform/ci-cd-pipelines" + file: "cloud-providers/azure.yml" diff --git a/devops/azure/README.md b/devops/azure/README.md new file mode 100644 index 00000000..1fea5615 --- /dev/null +++ b/devops/azure/README.md @@ -0,0 +1,3 @@ + +AZURE_SERVICE="storage" REPO_BRANCH="master" TAG="latest" PARTIAL=${REPO_BRANCH/\//-} BRANCH=${PARTIAL/./-} echo "--set image.branch=$BRANCH --set image.tag=$TAG" # Install the Service helm upgrade -i osdu-gitlab-$AZURE_SERVICE chart --set image.branch=$BRANCH --set image.tag=$TAG pod=$(kubectl get pod |grep $AZURE_SERVICE | tail -1 | awk '{print $1}') status=$(kubectl wait --for=condition=Ready pod/$pod --timeout=60s) if [[ "$status" != *"met"* ]]; then echo "POD didn't start correctly" ; exit 1 ; fi + diff --git a/devops/azure/chart/Chart.yaml b/devops/azure/chart/Chart.yaml new file mode 100644 index 00000000..b46460d8 --- /dev/null +++ b/devops/azure/chart/Chart.yaml @@ -0,0 +1,20 @@ +# Copyright © Microsoft Corporation +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. + +apiVersion: v1 +name: schema +appVersion: "latest" +description: Helm Chart for installing schema service. +version: 0.1.0 +type: application diff --git a/devops/azure/chart/templates/deployment.yaml b/devops/azure/chart/templates/deployment.yaml new file mode 100644 index 00000000..f1c06db9 --- /dev/null +++ b/devops/azure/chart/templates/deployment.yaml @@ -0,0 +1,114 @@ +# Copyright © Microsoft Corporation +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. + +apiVersion: apps/v1 +kind: Deployment +metadata: + name: {{ .Release.Name }}-{{ .Chart.Name }} + namespace: osdu +spec: + selector: + matchLabels: + app: {{ .Release.Name }}-{{ .Chart.Name }} + template: + metadata: + labels: + app: {{ .Release.Name }}-{{ .Chart.Name }} + aadpodidbinding: osdu-identity + spec: + volumes: + - name: azure-keyvault + csi: + driver: secrets-store.csi.k8s.io + readOnly: true + volumeAttributes: + secretProviderClass: azure-keyvault + containers: + - name: {{ .Release.Name }}-{{ .Chart.Name }} + image: {{ .Values.image.repository }}/{{ .Chart.Name }}-{{ .Values.global.image.branch }}:{{ .Values.image.tag | default .Chart.AppVersion }} + imagePullPolicy: Always + ports: + - containerPort: {{ .Values.service.port }} + readinessProbe: + httpGet: + path: {{ .Values.service.probe.path }} + port: {{ .Values.service.port }} + volumeMounts: + - name: azure-keyvault + mountPath: "/mnt/azure-keyvault" + readOnly: true + env: + - name: spring_application_name + value: schema + - name: LOG_PREFIX + value: "schema" + - name: server.servlet.contextPath + value: /api/schema-service/v1/ + - name: server.port + value: "80" + - name: KEYVAULT_URI + valueFrom: + configMapKeyRef: + name: osdu-svc-properties + key: ENV_KEYVAULT + - name: AZURE_TENANT_ID + valueFrom: + configMapKeyRef: + name: osdu-svc-properties + key: ENV_TENANT_ID + - name: AZURE_CLIENT_ID + valueFrom: + secretKeyRef: + name: clientid + key: clientid + - name: AZURE_CLIENT_SECRET + valueFrom: + secretKeyRef: + name: clientpassword + key: clientpassword + - name: azure.activedirectory.client-id + valueFrom: + secretKeyRef: + name: appid + key: appid + - name: azure_activedirectory_session_stateless + value: "true" + - name: azure_activedirectory_AppIdUri + value: "api://$(aad_client_id)" + - name: appinsights_key + valueFrom: + secretKeyRef: + name: appinsights + key: appinsights + - name: cosmosdb_account + valueFrom: + configMapKeyRef: + name: osdu-svc-properties + key: ENV_COSMOSDB_HOST + - name: cosmosdb_key + valueFrom: + secretKeyRef: + name: cosmos + key: cosmos + - name: cosmosdb_database + value: osdu-db + - name: storage_account + valueFrom: + configMapKeyRef: + name: osdu-svc-properties + key: ENV_STORAGE_ACCOUNT + - name: entitlements_service_endpoint + value: http://{{ .Release.Name }}-entitlements-azure/entitlements/v1 + - name: entitlements_service_api_key + value: "OBSOLETE" \ No newline at end of file diff --git a/devops/azure/chart/templates/service.yaml b/devops/azure/chart/templates/service.yaml new file mode 100644 index 00000000..590c35fe --- /dev/null +++ b/devops/azure/chart/templates/service.yaml @@ -0,0 +1,27 @@ +# Copyright © Microsoft Corporation +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. + +apiVersion: v1 +kind: Service +metadata: + name: {{ .Release.Name }}-{{ .Chart.Name }} + namespace: osdu +spec: + type: ClusterIP + ports: + - protocol: TCP + port: {{ .Values.service.port }} + targetPort: {{ .Values.service.port }} + selector: + app: {{ .Release.Name }}-{{ .Chart.Name }} diff --git a/devops/azure/chart/values.yaml b/devops/azure/chart/values.yaml new file mode 100644 index 00000000..93f6589c --- /dev/null +++ b/devops/azure/chart/values.yaml @@ -0,0 +1,23 @@ +# Copyright © Microsoft Corporation +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. + +config: + name: schema +image: + repository: community.opengroup.org:5555/osdu/platform/system/schema-service +service: + type: ClusterIP + port: 80 + probe: + path: /api/schema-service/v1/swagger-ui.html diff --git a/provider/schema-azure/Dockerfile b/provider/schema-azure/Dockerfile new file mode 100644 index 00000000..c63c2d6b --- /dev/null +++ b/provider/schema-azure/Dockerfile @@ -0,0 +1,4 @@ +FROM openjdk:8-jdk-alpine +ARG JAR_FILE=target/*spring-boot.jar +COPY ${JAR_FILE} app.jar +ENTRYPOINT ["java","-jar","/app.jar"] \ No newline at end of file -- GitLab From 6aa958f0fdd6f90b929ae19f5e4e51ecc87cb03e Mon Sep 17 00:00:00 2001 From: Aman Verma Date: Thu, 10 Sep 2020 09:47:56 +0530 Subject: [PATCH 02/12] adding branch name in values.yaml --- devops/azure/chart/templates/deployment.yaml | 2 +- devops/azure/chart/values.yaml | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/devops/azure/chart/templates/deployment.yaml b/devops/azure/chart/templates/deployment.yaml index f1c06db9..36d36291 100644 --- a/devops/azure/chart/templates/deployment.yaml +++ b/devops/azure/chart/templates/deployment.yaml @@ -36,7 +36,7 @@ spec: secretProviderClass: azure-keyvault containers: - name: {{ .Release.Name }}-{{ .Chart.Name }} - image: {{ .Values.image.repository }}/{{ .Chart.Name }}-{{ .Values.global.image.branch }}:{{ .Values.image.tag | default .Chart.AppVersion }} + image: {{ .Values.image.repository }}/{{ .Chart.Name }}-{{ .Values.image.branch }}:{{ .Values.image.tag | default .Chart.AppVersion }} imagePullPolicy: Always ports: - containerPort: {{ .Values.service.port }} diff --git a/devops/azure/chart/values.yaml b/devops/azure/chart/values.yaml index 93f6589c..07d37133 100644 --- a/devops/azure/chart/values.yaml +++ b/devops/azure/chart/values.yaml @@ -15,6 +15,7 @@ config: name: schema image: + branch: master repository: community.opengroup.org:5555/osdu/platform/system/schema-service service: type: ClusterIP -- GitLab From 9d7fd53e991ba30f0928c85b0e11068afa4b67ee Mon Sep 17 00:00:00 2001 From: Aman Verma Date: Thu, 10 Sep 2020 10:42:18 +0530 Subject: [PATCH 03/12] fixing variable naming --- devops/azure/chart/templates/deployment.yaml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/devops/azure/chart/templates/deployment.yaml b/devops/azure/chart/templates/deployment.yaml index 36d36291..4361c0b7 100644 --- a/devops/azure/chart/templates/deployment.yaml +++ b/devops/azure/chart/templates/deployment.yaml @@ -18,13 +18,14 @@ metadata: name: {{ .Release.Name }}-{{ .Chart.Name }} namespace: osdu spec: + replicas: {{ .Values.global.replicaCount }} selector: matchLabels: - app: {{ .Release.Name }}-{{ .Chart.Name }} + app: {{ .Chart.Name }} template: metadata: labels: - app: {{ .Release.Name }}-{{ .Chart.Name }} + app: {{ .Chart.Name }} aadpodidbinding: osdu-identity spec: volumes: -- GitLab From 9c786f93e461a37f9659392abfca8c0d1549f503 Mon Sep 17 00:00:00 2001 From: Aman Verma Date: Thu, 10 Sep 2020 11:26:31 +0530 Subject: [PATCH 04/12] fixing readme --- devops/azure/README.md | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/devops/azure/README.md b/devops/azure/README.md index 1fea5615..bdef11b4 100644 --- a/devops/azure/README.md +++ b/devops/azure/README.md @@ -1,3 +1,13 @@ +AZURE_SERVICE="storage" +REPO_BRANCH="master" +TAG="latest" +PARTIAL=${REPO_BRANCH/\//-} +BRANCH=${PARTIAL/./-} -AZURE_SERVICE="storage" REPO_BRANCH="master" TAG="latest" PARTIAL=${REPO_BRANCH/\//-} BRANCH=${PARTIAL/./-} echo "--set image.branch=$BRANCH --set image.tag=$TAG" # Install the Service helm upgrade -i osdu-gitlab-$AZURE_SERVICE chart --set image.branch=$BRANCH --set image.tag=$TAG pod=$(kubectl get pod |grep $AZURE_SERVICE | tail -1 | awk '{print $1}') status=$(kubectl wait --for=condition=Ready pod/$pod --timeout=60s) if [[ "$status" != *"met"* ]]; then echo "POD didn't start correctly" ; exit 1 ; fi +echo "--set image.branch=$BRANCH --set image.tag=$TAG" +# Install the Service +helm upgrade -i osdu-gitlab-$AZURE_SERVICE chart --set image.branch=$BRANCH --set image.tag=$TAG +pod=$(kubectl get pod |grep $AZURE_SERVICE | tail -1 | awk '{print $1}') +status=$(kubectl wait --for=condition=Ready pod/$pod --timeout=60s) +if [[ "$status" != *"met"* ]]; then echo "POD didn't start correctly" ; exit 1 ; fi -- GitLab From 80b5b95087579055b4df60eb635a74282a49297e Mon Sep 17 00:00:00 2001 From: Aman Verma Date: Thu, 10 Sep 2020 11:33:14 +0530 Subject: [PATCH 05/12] updating the variable naming --- devops/azure/chart/templates/deployment.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/devops/azure/chart/templates/deployment.yaml b/devops/azure/chart/templates/deployment.yaml index 4361c0b7..dd234a36 100644 --- a/devops/azure/chart/templates/deployment.yaml +++ b/devops/azure/chart/templates/deployment.yaml @@ -15,7 +15,7 @@ apiVersion: apps/v1 kind: Deployment metadata: - name: {{ .Release.Name }}-{{ .Chart.Name }} + name: {{ .Release.Name }} namespace: osdu spec: replicas: {{ .Values.global.replicaCount }} -- GitLab From 4b51518d48ab39ccf743643cd5d14769f3c4b1a5 Mon Sep 17 00:00:00 2001 From: Aman Verma Date: Thu, 10 Sep 2020 11:40:20 +0530 Subject: [PATCH 06/12] updating the variable name --- devops/azure/chart/templates/deployment.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/devops/azure/chart/templates/deployment.yaml b/devops/azure/chart/templates/deployment.yaml index dd234a36..37b85018 100644 --- a/devops/azure/chart/templates/deployment.yaml +++ b/devops/azure/chart/templates/deployment.yaml @@ -36,7 +36,7 @@ spec: volumeAttributes: secretProviderClass: azure-keyvault containers: - - name: {{ .Release.Name }}-{{ .Chart.Name }} + - name: {{ .Chart.Name }} image: {{ .Values.image.repository }}/{{ .Chart.Name }}-{{ .Values.image.branch }}:{{ .Values.image.tag | default .Chart.AppVersion }} imagePullPolicy: Always ports: -- GitLab From 691802964c3baf42d12cadd80872b0be48d6d656 Mon Sep 17 00:00:00 2001 From: Aman Verma Date: Thu, 10 Sep 2020 12:50:53 +0530 Subject: [PATCH 07/12] updating the gitlab-ci.yml --- .gitlab-ci.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 2f336eed..5f8994bd 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -25,8 +25,8 @@ include: - project: "osdu/platform/ci-cd-pipelines" file: "build/maven.yml" - # - project: "osdu/platform/ci-cd-pipelines" - # file: "scanners/fossa.yml" + - project: "osdu/platform/ci-cd-pipelines" + file: "scanners/fossa.yml" # - project: "osdu/platform/ci-cd-pipelines" # file: "cloud-providers/gcp.yml" -- GitLab From d26e960f352f87a7c0f2364758b859d0a8f2c7f3 Mon Sep 17 00:00:00 2001 From: Aman Verma Date: Thu, 10 Sep 2020 13:15:28 +0530 Subject: [PATCH 08/12] keeping variable naming identical to storage service --- devops/azure/chart/templates/deployment.yaml | 13 +++++++++---- devops/azure/chart/templates/service.yaml | 9 +++++---- devops/azure/chart/values.yaml | 14 ++++++-------- 3 files changed, 20 insertions(+), 16 deletions(-) diff --git a/devops/azure/chart/templates/deployment.yaml b/devops/azure/chart/templates/deployment.yaml index 37b85018..043f3ca4 100644 --- a/devops/azure/chart/templates/deployment.yaml +++ b/devops/azure/chart/templates/deployment.yaml @@ -40,11 +40,11 @@ spec: image: {{ .Values.image.repository }}/{{ .Chart.Name }}-{{ .Values.image.branch }}:{{ .Values.image.tag | default .Chart.AppVersion }} imagePullPolicy: Always ports: - - containerPort: {{ .Values.service.port }} + - containerPort: 80 readinessProbe: httpGet: - path: {{ .Values.service.probe.path }} - port: {{ .Values.service.port }} + path: /api/schema-service/v1/swagger-ui.html + port: 80 volumeMounts: - name: azure-keyvault mountPath: "/mnt/azure-keyvault" @@ -83,6 +83,11 @@ spec: secretKeyRef: name: appid key: appid + - name: aad_client_id + valueFrom: + secretKeyRef: + name: appid + key: appid - name: azure_activedirectory_session_stateless value: "true" - name: azure_activedirectory_AppIdUri @@ -110,6 +115,6 @@ spec: name: osdu-svc-properties key: ENV_STORAGE_ACCOUNT - name: entitlements_service_endpoint - value: http://{{ .Release.Name }}-entitlements-azure/entitlements/v1 + value: http://entitlements-azure/entitlements/v1 - name: entitlements_service_api_key value: "OBSOLETE" \ No newline at end of file diff --git a/devops/azure/chart/templates/service.yaml b/devops/azure/chart/templates/service.yaml index 590c35fe..2202bfaf 100644 --- a/devops/azure/chart/templates/service.yaml +++ b/devops/azure/chart/templates/service.yaml @@ -15,13 +15,14 @@ apiVersion: v1 kind: Service metadata: - name: {{ .Release.Name }}-{{ .Chart.Name }} + name: {{ .Chart.Name }} namespace: osdu spec: type: ClusterIP ports: - protocol: TCP - port: {{ .Values.service.port }} - targetPort: {{ .Values.service.port }} + port: 80 + targetPort: 80 selector: - app: {{ .Release.Name }}-{{ .Chart.Name }} + app: {{ .Chart.Name }} + diff --git a/devops/azure/chart/values.yaml b/devops/azure/chart/values.yaml index 07d37133..30b9a5f7 100644 --- a/devops/azure/chart/values.yaml +++ b/devops/azure/chart/values.yaml @@ -11,14 +11,12 @@ # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. # See the License for the specific language governing permissions and # limitations under the License. + +global: + replicaCount: 1 -config: - name: schema image: - branch: master repository: community.opengroup.org:5555/osdu/platform/system/schema-service -service: - type: ClusterIP - port: 80 - probe: - path: /api/schema-service/v1/swagger-ui.html + branch: master + tag: latest + -- GitLab From c06e2082efa31667237bad5dc8e69aedcd960795 Mon Sep 17 00:00:00 2001 From: Aman Verma Date: Thu, 10 Sep 2020 15:05:49 +0530 Subject: [PATCH 09/12] updating the yaml file --- devops/azure/README.md | 6 +++++- devops/azure/chart/templates/deployment.yaml | 9 --------- provider/schema-azure/Dockerfile | 4 ---- 3 files changed, 5 insertions(+), 14 deletions(-) delete mode 100644 provider/schema-azure/Dockerfile diff --git a/devops/azure/README.md b/devops/azure/README.md index bdef11b4..fdaa5468 100644 --- a/devops/azure/README.md +++ b/devops/azure/README.md @@ -1,4 +1,7 @@ -AZURE_SERVICE="storage" +# Pipeline Support Commands + +```bash +AZURE_SERVICE="schema" REPO_BRANCH="master" TAG="latest" PARTIAL=${REPO_BRANCH/\//-} @@ -11,3 +14,4 @@ helm upgrade -i osdu-gitlab-$AZURE_SERVICE chart --set image.branch=$BRANCH --se pod=$(kubectl get pod |grep $AZURE_SERVICE | tail -1 | awk '{print $1}') status=$(kubectl wait --for=condition=Ready pod/$pod --timeout=60s) if [[ "$status" != *"met"* ]]; then echo "POD didn't start correctly" ; exit 1 ; fi +``` diff --git a/devops/azure/chart/templates/deployment.yaml b/devops/azure/chart/templates/deployment.yaml index 043f3ca4..96bd2944 100644 --- a/devops/azure/chart/templates/deployment.yaml +++ b/devops/azure/chart/templates/deployment.yaml @@ -78,20 +78,11 @@ spec: secretKeyRef: name: clientpassword key: clientpassword - - name: azure.activedirectory.client-id - valueFrom: - secretKeyRef: - name: appid - key: appid - name: aad_client_id valueFrom: secretKeyRef: name: appid key: appid - - name: azure_activedirectory_session_stateless - value: "true" - - name: azure_activedirectory_AppIdUri - value: "api://$(aad_client_id)" - name: appinsights_key valueFrom: secretKeyRef: diff --git a/provider/schema-azure/Dockerfile b/provider/schema-azure/Dockerfile deleted file mode 100644 index c63c2d6b..00000000 --- a/provider/schema-azure/Dockerfile +++ /dev/null @@ -1,4 +0,0 @@ -FROM openjdk:8-jdk-alpine -ARG JAR_FILE=target/*spring-boot.jar -COPY ${JAR_FILE} app.jar -ENTRYPOINT ["java","-jar","/app.jar"] \ No newline at end of file -- GitLab From 04cfce1e24d886520546c950b3e4d7b584e20d93 Mon Sep 17 00:00:00 2001 From: Aman Verma Date: Thu, 10 Sep 2020 15:07:36 +0530 Subject: [PATCH 10/12] uncommenting common stuf --- .gitlab-ci.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 5f8994bd..6831ebb8 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -37,8 +37,8 @@ include: - project: "osdu/platform/ci-cd-pipelines" file: "cloud-providers/ibm.yml" - # - project: "osdu/platform/ci-cd-pipelines" - # file: "scanners/gitlab-ultimate.yml" + - project: "osdu/platform/ci-cd-pipelines" + file: "scanners/gitlab-ultimate.yml" - project: "osdu/platform/ci-cd-pipelines" file: "cloud-providers/azure.yml" -- GitLab From e5feb36abfdcd2cd0602ecf3a0c0af8d1aab66c1 Mon Sep 17 00:00:00 2001 From: Hema Vishnu Pola Date: Thu, 10 Sep 2020 14:28:11 -0400 Subject: [PATCH 11/12] Update Chart.yaml --- devops/azure/chart/Chart.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/devops/azure/chart/Chart.yaml b/devops/azure/chart/Chart.yaml index b46460d8..4a4df5e2 100644 --- a/devops/azure/chart/Chart.yaml +++ b/devops/azure/chart/Chart.yaml @@ -13,7 +13,7 @@ # limitations under the License. apiVersion: v1 -name: schema +name: schema-service appVersion: "latest" description: Helm Chart for installing schema service. version: 0.1.0 -- GitLab From 4858f6ce95d8bf370c674da00bcf87f60bf1e066 Mon Sep 17 00:00:00 2001 From: Aman Verma Date: Fri, 11 Sep 2020 13:05:17 +0530 Subject: [PATCH 12/12] commenting out the scanners/fossa.yml step --- .gitlab-ci.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 6831ebb8..961ae0ca 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -25,8 +25,8 @@ include: - project: "osdu/platform/ci-cd-pipelines" file: "build/maven.yml" - - project: "osdu/platform/ci-cd-pipelines" - file: "scanners/fossa.yml" + # - project: "osdu/platform/ci-cd-pipelines" + # file: "scanners/fossa.yml" # - project: "osdu/platform/ci-cd-pipelines" # file: "cloud-providers/gcp.yml" -- GitLab