Merge branch...

Merge branch '1068-error-converting-yaml-to-json-yaml-line-46-mapping-values-are-not-allowed-in-this-context' into 'main'

Resolve "error converting YAML to JSON: yaml: line 46: mapping values are not allowed in this context"

Closes #1068

See merge request !260

.gitlab-ci.yml

@@ -60,11 +60,13 @@ install-helmrelease:
     - sed -i "s/files-cert/files-cert-nc$CI_MERGE_REQUEST_IID/" values-ci.yaml
     - sed -i "s/office-cert/office-cert-nc$CI_MERGE_REQUEST_IID/" values-ci.yaml
     - |
-      echo -e "tests:\n  cypress:\n    projectId: $CYPRESS_PROJECT_ID\n    recordKey: $CYPRESS_RECORD_KEY" >> values-ci.yaml
-      echo -e "    commitInfo:\n      branch: $CI_COMMIT_REF_NAME\n      message: $CI_COMMIT_TITLE\n      author: $CI_COMMIT_AUTHOR\n      sha: $CI_COMMIT_SHORT_SHA" >> values-ci.yaml
+      export message="$(echo $CI_COMMIT_TITLE | tr '!#$%^&*()=+{}[]:"|<>?,./;' '-')"
+      echo -e "tests:\n  cypress:\n    projectId: \"$CYPRESS_PROJECT_ID\"\n    recordKey: \"$CYPRESS_RECORD_KEY\"" >> values-ci.yaml
+      echo -e "    commitInfo:\n      branch: \"$CI_COMMIT_REF_SLUG\"\n      message: \"$message\"\n      author: \"$CI_COMMIT_AUTHOR\"\n      sha: \"$CI_COMMIT_SHORT_SHA\"" \
+        >> values-ci.yaml
     - cat values-ci.yaml
     - time kubectl delete namespace "nc$CI_MERGE_REQUEST_IID" || true
-    - time helm install --create-namespace -n nc$CI_MERGE_REQUEST_IID --wait "nc$CI_MERGE_REQUEST_IID" . -f values-ci.yaml
+    - time helm install --timeout 20m --create-namespace -n nc$CI_MERGE_REQUEST_IID --wait "nc$CI_MERGE_REQUEST_IID" . -f values-ci.yaml
   environment:
     name: helmrelease/nc$CI_MERGE_REQUEST_IID
     url: https://files-nc$CI_MERGE_REQUEST_IID.gitlab.stackspin.net

CHANGELOG.md

+# Changelog
+
+## [0.10.28] - 2022-09-06
+
+* Quote other COMMIT_INFO values to not screw up yaml
+
 ## [0.10.23] - 2022-08-24
 
 * Update Helm release rabbitmq to v10.3.1

Chart.yaml

@@ -3,7 +3,7 @@ apiVersion: v2
 description: |
   A helm chart for installing NextCloud and setting up ONLYOFFICE integration
 name: nextcloud-onlyoffice
-version: 0.10.27
+version: 0.10.28
 appVersion: NC-24.0.2-OO-7.1.1.23
 icon: https://cdn.rawgit.com/docker-library/docs/defa5ffc7123177acd60ddef6e16bddf694cc35f/nextcloud/logo.svg
 dependencies:

templates/tests/cypress-test-nc-oo.yaml

@@ -48,10 +48,10 @@ spec:
               key: {{ .Values.nextcloud.nextcloud.existingSecret.passwordKey | default "nextcloud-password" }}
         {{- end }}
         - name: CYPRESS_ONLYOFFICE_URL
-          value: {{ .Values.onlyoffice.server_name }}
+          value: "{{ .Values.onlyoffice.server_name }}"
         {{- if .Values.tests.cypress.projectId }}
         - name: CYPRESS_PROJECT_ID
-          value: {{ .Values.tests.cypress.projectId }}
+          value: "{{ .Values.tests.cypress.projectId }}"
         {{- end }}
         {{- if .Values.tests.cypress.recordKey }}
         - name: CYPRESS_RECORD_KEY
@@ -60,15 +60,15 @@ spec:
         {{- if .Values.tests.cypress.commitInfo }}
         {{- if .Values.tests.cypress.commitInfo.branch }}
         - name: COMMIT_INFO_BRANCH
-          value: {{ .Values.tests.cypress.commitInfo.branch }}
+          value: "{{ .Values.tests.cypress.commitInfo.branch }}"
         {{- end }}
         {{- if .Values.tests.cypress.commitInfo.message }}
         - name: COMMIT_INFO_MESSAGE
-          value: {{ .Values.tests.cypress.commitInfo.message }}
+          value: "{{ .Values.tests.cypress.commitInfo.message }}"
         {{- end }}
         {{- if .Values.tests.cypress.commitInfo.author }}
         - name: COMMIT_INFO_AUTHOR
-          value: {{ .Values.tests.cypress.commitInfo.author }}
+          value: "{{ .Values.tests.cypress.commitInfo.author }}"
         {{- end }}
         {{- if .Values.tests.cypress.commitInfo.sha }}
         - name: COMMIT_INFO_SHA