From e0ef4a7903c026cbf782e9378fbd840d38317a40 Mon Sep 17 00:00:00 2001
From: Varac <varac@varac.net>
Date: Tue, 23 Aug 2022 14:44:19 +0200
Subject: [PATCH] Set CYPRESS_PROJECT_ID from env var
---
.gitlab-ci.yml | 2 +-
CHANGELOG.md | 5 +++++
Chart.yaml | 4 ++--
cypress.config.js | 1 -
templates/tests/cypress-test-nc-oo.yaml | 2 ++
values.yaml | 3 ++-
6 files changed, 12 insertions(+), 5 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 8f616cf1..42b57281 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 a19f1ce9..25761bae 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 ca51a745..2628efcc 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 8f25f825..79b326ed 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 8b1702a7..be63cf2d 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 a45b573f..b77d2646 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: ""
--
GitLab