diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 42b57281e867537949b13bcf072f8f69b56406d2..a4404247832d248134ce4361f115a312b8b4c297 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -61,6 +61,8 @@ install-helmrelease: - 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_BRANCH\n message: $CI_COMMIT_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 environment: diff --git a/CHANGELOG.md b/CHANGELOG.md index 25761baedb3a88c67cad8a29897c3196af9a726c..cb073ae50934f1fb0f19e2f0a71386f2569f2010 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,7 @@ +## [0.10.19] - 2022-08-23 + +* Set Cypress env vars for git details + ## [0.10.18] - 2022-08-23 * Add Cypress projectId value and remove hardcoded project id from cypress.config.js diff --git a/Chart.yaml b/Chart.yaml index 2628efcce445adef4990aca23b5c9f6fba2b92dc..291b4a451019b8d79c0210dbe634007a195ee204 100644 --- a/Chart.yaml +++ b/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.18 +version: 0.10.19 appVersion: NC-24.0.2-OO-7.1.1.23 icon: https://cdn.rawgit.com/docker-library/docs/defa5ffc7123177acd60ddef6e16bddf694cc35f/nextcloud/logo.svg dependencies: diff --git a/templates/tests/cypress-test-nc-oo.yaml b/templates/tests/cypress-test-nc-oo.yaml index be63cf2d8638fe7c4ba40fdad66651d6494a0270..16395e85869bd4bac4a86d9ad8a1900940ee7d30 100644 --- a/templates/tests/cypress-test-nc-oo.yaml +++ b/templates/tests/cypress-test-nc-oo.yaml @@ -53,6 +53,24 @@ spec: value: {{ .Values.tests.cypress.projectId }} - name: CYPRESS_RECORD_KEY value: {{ .Values.tests.cypress.recordKey }} + {{- if .Values.tests.cypress.commitInfo }} + {{- if .Values.tests.cypress.commitInfo.branch }} + - name: COMMIT_INFO_BRANCH + value: {{ .Values.tests.cypress.commitInfo.branch }} + {{- end }} + {{- if .Values.tests.cypress.commitInfo.message }} + - name: COMMIT_INFO_MESSAGE + value: {{ .Values.tests.cypress.commitInfo.message }} + {{- end }} + {{- if .Values.tests.cypress.commitInfo.author }} + - name: COMMIT_INFO_AUTHOR + value: {{ .Values.tests.cypress.commitInfo.author }} + {{- end }} + {{- if .Values.tests.cypress.commitInfo.sha }} + - name: COMMIT_INFO_SHA + value: {{ .Values.tests.cypress.commitInfo.sha }} + {{- end }} + {{- end }} - name: INSTALLED_APPS value: "{{ range .Values.apps }}{{ .name }},{{ end }}" volumeMounts: diff --git a/values.yaml b/values.yaml index b77d2646ccded5329c8745335ea3887ebd3158ae..b06348fd4ebe13b4d562ea4c90b68f3f8be92de7 100644 --- a/values.yaml +++ b/values.yaml @@ -230,3 +230,9 @@ tests: # to the cypress dashboard projectId: "" recordKey: "" + # Optionally provide git details from selfhosted Gitlab CI + # commitInfo: + # branch: + # message: + # author: + # sha: