diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 8f616cf14cc2463ef6020ec97acc7d23c418bdd4..42b57281e867537949b13bcf072f8f69b56406d2 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -60,7 +60,7 @@ 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 recordKey: $CYPRESS_RECORD_KEY" >> values-ci.yaml + echo -e "tests:\n cypress:\n projectId: $CYPRESS_PROJECT_ID\n recordKey: $CYPRESS_RECORD_KEY" >> 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 a19f1ce92ed3775986875269703576860b215534..25761baedb3a88c67cad8a29897c3196af9a726c 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,8 @@ +## [0.10.18] - 2022-08-23 + +* Add Cypress projectId value and remove hardcoded project id from cypress.config.js +* Fix stale app version numbers in Chart.yaml + ## [0.10.9] - 2022-08-03 * Fix trusted_proxies to allow nextcloud to read correct remote IP addresses. diff --git a/Chart.yaml b/Chart.yaml index ca51a745cbe78d3215a82ff4721e4698cea62067..2628efcce445adef4990aca23b5c9f6fba2b92dc 100644 --- a/Chart.yaml +++ b/Chart.yaml @@ -3,8 +3,8 @@ apiVersion: v2 description: | A helm chart for installing NextCloud and setting up ONLYOFFICE integration name: nextcloud-onlyoffice -version: 0.10.17 -appVersion: NC-23.0.3-OO-7.0.1.37 +version: 0.10.18 +appVersion: NC-24.0.2-OO-7.1.1.23 icon: https://cdn.rawgit.com/docker-library/docs/defa5ffc7123177acd60ddef6e16bddf694cc35f/nextcloud/logo.svg dependencies: # https://artifacthub.io/packages/helm/nextcloud/nextcloud diff --git a/cypress.config.js b/cypress.config.js index 8f25f8250098bbdb27297cc930c741fe5c70b0d6..79b326ed8499e82bff7db8b4d69d2b53d3a44726 100644 --- a/cypress.config.js +++ b/cypress.config.js @@ -1,7 +1,6 @@ const { defineConfig } = require("cypress"); module.exports = defineConfig({ - projectId: 'ctgfgm', e2e: { setupNodeEvents(on, config) { // implement node event listeners here diff --git a/templates/tests/cypress-test-nc-oo.yaml b/templates/tests/cypress-test-nc-oo.yaml index 8b1702a702cb12eea801a1b10834480a0b6c3eb8..be63cf2d8638fe7c4ba40fdad66651d6494a0270 100644 --- a/templates/tests/cypress-test-nc-oo.yaml +++ b/templates/tests/cypress-test-nc-oo.yaml @@ -49,6 +49,8 @@ spec: {{- end }} - name: CYPRESS_ONLYOFFICE_URL value: {{ .Values.onlyoffice.server_name }} + - name: CYPRESS_PROJECT_ID + value: {{ .Values.tests.cypress.projectId }} - name: CYPRESS_RECORD_KEY value: {{ .Values.tests.cypress.recordKey }} - name: INSTALLED_APPS diff --git a/values.yaml b/values.yaml index a45b573f48f6d71992ff0ec9ac32b198cd0efe40..b77d2646ccded5329c8745335ea3887ebd3158ae 100644 --- a/values.yaml +++ b/values.yaml @@ -226,6 +226,7 @@ tests: key: userbackend_admin_password namespace: flux-system cypress: - # Set record key if cypress screenshots and videos should be uploaded + # Set project ID and record key if cypress screenshots and videos should be uploaded # to the cypress dashboard + projectId: "" recordKey: ""