Skip to content
Snippets Groups Projects
Commit ee537aef authored by Varac's avatar Varac
Browse files

Merge branch 'cypress_project_id' into 'main'

Set CYPRESS_PROJECT_ID from env var

See merge request !246
parents a6842df7 e0ef4a79
No related branches found
No related tags found
1 merge request!246Set CYPRESS_PROJECT_ID from env var
Pipeline #25593 passed with stages
in 9 minutes and 24 seconds
...@@ -60,7 +60,7 @@ install-helmrelease: ...@@ -60,7 +60,7 @@ install-helmrelease:
- sed -i "s/files-cert/files-cert-nc$CI_MERGE_REQUEST_IID/" values-ci.yaml - 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 - 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 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 --create-namespace -n nc$CI_MERGE_REQUEST_IID --wait "nc$CI_MERGE_REQUEST_IID" . -f values-ci.yaml
environment: environment:
......
## [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 ## [0.10.9] - 2022-08-03
* Fix trusted_proxies to allow nextcloud to read correct remote IP addresses. * Fix trusted_proxies to allow nextcloud to read correct remote IP addresses.
......
...@@ -3,8 +3,8 @@ apiVersion: v2 ...@@ -3,8 +3,8 @@ apiVersion: v2
description: | description: |
A helm chart for installing NextCloud and setting up ONLYOFFICE integration A helm chart for installing NextCloud and setting up ONLYOFFICE integration
name: nextcloud-onlyoffice name: nextcloud-onlyoffice
version: 0.10.17 version: 0.10.18
appVersion: NC-23.0.3-OO-7.0.1.37 appVersion: NC-24.0.2-OO-7.1.1.23
icon: https://cdn.rawgit.com/docker-library/docs/defa5ffc7123177acd60ddef6e16bddf694cc35f/nextcloud/logo.svg icon: https://cdn.rawgit.com/docker-library/docs/defa5ffc7123177acd60ddef6e16bddf694cc35f/nextcloud/logo.svg
dependencies: dependencies:
# https://artifacthub.io/packages/helm/nextcloud/nextcloud # https://artifacthub.io/packages/helm/nextcloud/nextcloud
......
const { defineConfig } = require("cypress"); const { defineConfig } = require("cypress");
module.exports = defineConfig({ module.exports = defineConfig({
projectId: 'ctgfgm',
e2e: { e2e: {
setupNodeEvents(on, config) { setupNodeEvents(on, config) {
// implement node event listeners here // implement node event listeners here
......
...@@ -49,6 +49,8 @@ spec: ...@@ -49,6 +49,8 @@ spec:
{{- end }} {{- end }}
- name: CYPRESS_ONLYOFFICE_URL - name: CYPRESS_ONLYOFFICE_URL
value: {{ .Values.onlyoffice.server_name }} value: {{ .Values.onlyoffice.server_name }}
- name: CYPRESS_PROJECT_ID
value: {{ .Values.tests.cypress.projectId }}
- name: CYPRESS_RECORD_KEY - name: CYPRESS_RECORD_KEY
value: {{ .Values.tests.cypress.recordKey }} value: {{ .Values.tests.cypress.recordKey }}
- name: INSTALLED_APPS - name: INSTALLED_APPS
......
...@@ -226,6 +226,7 @@ tests: ...@@ -226,6 +226,7 @@ tests:
key: userbackend_admin_password key: userbackend_admin_password
namespace: flux-system namespace: flux-system
cypress: 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 # to the cypress dashboard
projectId: ""
recordKey: "" recordKey: ""
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment