Move helm charts publishing into the osdu-gcp files

a56da928 · David Diederich · Oleksandr Kosse (EPAM) · 6faea595 · a56da928 · a56da928
Commit a56da928 authored Jul 02, 2021 by David Diederich Committed by Oleksandr Kosse (EPAM) Jul 02, 2021
--- a/cloud-providers/osdu-gcp-cloudrun.yml
+++ b/cloud-providers/osdu-gcp-cloudrun.yml
@@ -22,6 +22,9 @@
 # OSDU_GCP_INTEGRATION_TESTER
 # OSDU_GCP_NO_DATA_ACCESS_TESTER

+include:
+  - local: 'cloud-providers/osdu-gcp-global.yml'
+
 .osdu-gcp-variables:
  variables:
    # services' urls

--- a/cloud-providers/osdu-gcp-global.yml
+++ b/cloud-providers/osdu-gcp-global.yml
+osdu-gcp-helm-charts:
+  stage: build
+  tags: ['osdu-small']
+  image:
+    name: alpine/helm:3.5.4
+    entrypoint: [""]
+  artifacts:
+    paths:
+      - helm-charts
+  rules:
+    - if: $OSDU_GCP_HELM_PACKAGE_CHARTS
+      when: on_success
+  script:
+    - mkdir -p helm-charts
+    - helm package $OSDU_GCP_HELM_PACKAGE_CHARTS --destination helm-charts
+    - helm repo index --url "${CI_SERVER_URL}/${CI_PROJECT_PATH}/-/jobs/${CI_JOB_ID}/artifacts/raw" .
+    - mv index.yaml helm-charts
--- a/cloud-providers/osdu-gcp.yml
+++ b/cloud-providers/osdu-gcp.yml
+include:
+  - local: 'cloud-providers/osdu-gcp-global.yml'
+
 .OSDU_GCP_variables:
  variables:
    # service's URLs

--- a/publishing/pages.yml
+++ b/publishing/pages.yml
 pages:
-  image: 
-    name: alpine/helm:3.5.4
-    entrypoint: [""]
+  image: alpine
  stage: publish
-  #needs: ['fossa-report']
  tags: ['osdu-small']
  artifacts:
    paths:
      - public
  rules:
-    - if: $CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH && $OSDU_GCP_HELM_PACKAGE_CHARTS
-      when: always
+    - if: $CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH
  script:
-    - apk add curl
    - mkdir -p public
    - echo "<html><head><title>${CI_PROJECT_NAME}</title></head><body>" > public/index.html
    - find public -type f -not -name index.html | sed 's|public/\(.*\)|<a href="\1">\1</a>|' >> public/index.html
    - echo "</body></html>" >> public/index.html
-      ## publish GCP helm charts
-    - STATUS_CODE=$(curl --write-out '%{http_code}' --silent --output /dev/null ${CI_PAGES_URL}/index.yaml)
-    - echo $STATUS_CODE
-    - 'if [ "$STATUS_CODE" -ne 200 ] ; then touch index.yaml && echo "apiVersion: v1" >> index.yaml ; else curl --silent --show-error ${CI_PAGES_URL}/index.yaml -o "index.yaml" ; fi'
-    - helm package $OSDU_GCP_HELM_PACKAGE_CHARTS --destination ./public
-    - helm repo index --url ${CI_PAGES_URL} --merge index.yaml .
-    - sed -i 's|public/||g' index.yaml
-    - mv index.yaml ./public