mirror of
https://gitlab.opencode.de/bmi/opendesk/deployment/opendesk.git
synced 2025-12-06 15:31:38 +01:00
Compare commits
6 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
917f9fb452 | ||
|
|
f46c8a9a5f | ||
|
|
c2b44da34e | ||
|
|
41b9afb364 | ||
|
|
63bdcf594b | ||
|
|
a99c088361 |
@@ -135,6 +135,15 @@ variables:
|
|||||||
TESTS_BRANCH:
|
TESTS_BRANCH:
|
||||||
description: "Branch of E2E-tests on which the test pipeline is triggered"
|
description: "Branch of E2E-tests on which the test pipeline is triggered"
|
||||||
value: "main"
|
value: "main"
|
||||||
|
RUN_UMS_TESTS:
|
||||||
|
description: "Run E2E test suite of SouvAP Dev team"
|
||||||
|
value: "no"
|
||||||
|
options:
|
||||||
|
- "yes"
|
||||||
|
- "no"
|
||||||
|
UMS_TESTS_BRANCH:
|
||||||
|
description: "Branch of E2E test suite of SouvAP Dev team"
|
||||||
|
value: "main"
|
||||||
# please use the following set of variables with normalized names:
|
# please use the following set of variables with normalized names:
|
||||||
DOMAIN: "${NAMESPACE}.${CLUSTER}.${BASE_DOMAIN}"
|
DOMAIN: "${NAMESPACE}.${CLUSTER}.${BASE_DOMAIN}"
|
||||||
ISTIO_DOMAIN: "${NAMESPACE}.istio.${CLUSTER}.${BASE_DOMAIN}"
|
ISTIO_DOMAIN: "${NAMESPACE}.istio.${CLUSTER}.${BASE_DOMAIN}"
|
||||||
@@ -452,6 +461,54 @@ run-tests:
|
|||||||
}" \
|
}" \
|
||||||
"https://${TESTS_PROJECT_URL}/trigger/pipeline"
|
"https://${TESTS_PROJECT_URL}/trigger/pipeline"
|
||||||
|
|
||||||
|
run-souvap-dev-tests:
|
||||||
|
extends: ".deploy-common"
|
||||||
|
environment:
|
||||||
|
name: "${NAMESPACE}"
|
||||||
|
tags:
|
||||||
|
- "docker"
|
||||||
|
- "kubernetes"
|
||||||
|
- "${CLUSTER}"
|
||||||
|
stage: "tests"
|
||||||
|
rules:
|
||||||
|
- if: >
|
||||||
|
$CI_PIPELINE_SOURCE =~ "web|schedules|triggers" && $NAMESPACE =~ /.+/ && $RUN_UMS_TESTS == "yes"
|
||||||
|
when: "always"
|
||||||
|
script:
|
||||||
|
- |
|
||||||
|
UCS_CONTAINER_NAME=$( \
|
||||||
|
kubectl -n ${NAMESPACE} get pods --no-headers --selector \
|
||||||
|
'app.kubernetes.io/instance=univention-corporate-container' \
|
||||||
|
| grep Running \
|
||||||
|
| awk '{print $1}' \
|
||||||
|
)
|
||||||
|
DEFAULT_USER_PASSWORD=$( \
|
||||||
|
kubectl -n ${NAMESPACE} describe pod ${UCS_CONTAINER_NAME} \
|
||||||
|
| grep DEFAULT_ACCOUNT_USER_PASSWORD \
|
||||||
|
| awk '{print $2}' \
|
||||||
|
)
|
||||||
|
DEFAULT_ADMIN_PASSWORD=$(
|
||||||
|
kubectl -n ${NAMESPACE} describe pod ${UCS_CONTAINER_NAME} \
|
||||||
|
| grep DEFAULT_ACCOUNT_ADMIN_PASSWORD \
|
||||||
|
| awk '{print $2}' \
|
||||||
|
)
|
||||||
|
|
||||||
|
curl --request POST \
|
||||||
|
--header "Content-Type: application/json" \
|
||||||
|
--data "{ \
|
||||||
|
\"ref\": \"${UMS_TESTS_BRANCH}\", \
|
||||||
|
\"token\": \"${CI_JOB_TOKEN}\", \
|
||||||
|
\"variables\": { \
|
||||||
|
\"portal_base_url\": \"https://portal.${DOMAIN}\", \
|
||||||
|
\"username\": \"${DEFAULT_USER_NAME}\", \
|
||||||
|
\"password\": \"${DEFAULT_USER_PASSWORD}\", \
|
||||||
|
\"admin_username\": \"${DEFAULT_ADMIN_NAME}\", \
|
||||||
|
\"admin_password\": \"${DEFAULT_ADMIN_PASSWORD}\", \
|
||||||
|
\"keycloak_base_url\": \"https://id.${DOMAIN}\" \
|
||||||
|
} \
|
||||||
|
}" \
|
||||||
|
"https://${UMS_TESTS_PROJECT_URL}/trigger/pipeline"
|
||||||
|
|
||||||
generate-release-assets:
|
generate-release-assets:
|
||||||
stage: "generate-release-assets"
|
stage: "generate-release-assets"
|
||||||
image: "registry.souvap-univention.de/souvap/tooling/images/ansible:4.10.0"
|
image: "registry.souvap-univention.de/souvap/tooling/images/ansible:4.10.0"
|
||||||
|
|||||||
21
CHANGELOG.md
21
CHANGELOG.md
@@ -1,3 +1,24 @@
|
|||||||
|
## [0.4.2](https://gitlab.opencode.de/bmi/souveraener_arbeitsplatz/deployment/sovereign-workplace/compare/v0.4.1...v0.4.2) (2023-09-21)
|
||||||
|
|
||||||
|
|
||||||
|
### Bug Fixes
|
||||||
|
|
||||||
|
* **nextcloud:** Add Nextcloud app for OpenProject integration; Bump Collabora Image ([f46c8a9](https://gitlab.opencode.de/bmi/souveraener_arbeitsplatz/deployment/sovereign-workplace/commit/f46c8a9a5f4f9778cb171d65e9a0280e4ce61c16))
|
||||||
|
|
||||||
|
## [0.4.1](https://gitlab.opencode.de/bmi/souveraener_arbeitsplatz/deployment/sovereign-workplace/compare/v0.4.0...v0.4.1) (2023-09-19)
|
||||||
|
|
||||||
|
|
||||||
|
### Bug Fixes
|
||||||
|
|
||||||
|
* **univention-management-stack:** Remove doublette triple dashes in helmfile.yaml ([41b9afb](https://gitlab.opencode.de/bmi/souveraener_arbeitsplatz/deployment/sovereign-workplace/commit/41b9afb3648a0e1fddc5aa4337cc1501756b370c))
|
||||||
|
|
||||||
|
# [0.4.0](https://gitlab.opencode.de/bmi/souveraener_arbeitsplatz/deployment/sovereign-workplace/compare/v0.3.2...v0.4.0) (2023-09-18)
|
||||||
|
|
||||||
|
|
||||||
|
### Features
|
||||||
|
|
||||||
|
* **ci:** Optionally trigger E2E tests of the SouvAP Dev team ([a99c088](https://gitlab.opencode.de/bmi/souveraener_arbeitsplatz/deployment/sovereign-workplace/commit/a99c088361b95b2bb7ee2b161e3a254f02bcd9ae))
|
||||||
|
|
||||||
## [0.3.2](https://gitlab.opencode.de/bmi/souveraener_arbeitsplatz/deployment/sovereign-workplace/compare/v0.3.1...v0.3.2) (2023-09-14)
|
## [0.3.2](https://gitlab.opencode.de/bmi/souveraener_arbeitsplatz/deployment/sovereign-workplace/compare/v0.3.1...v0.3.2) (2023-09-14)
|
||||||
|
|
||||||
|
|
||||||
|
|||||||
@@ -17,7 +17,7 @@ repositories:
|
|||||||
releases:
|
releases:
|
||||||
- name: "opendesk-nextcloud-bootstrap"
|
- name: "opendesk-nextcloud-bootstrap"
|
||||||
chart: "opendesk-nextcloud-bootstrap-repo/opendesk-nextcloud-bootstrap"
|
chart: "opendesk-nextcloud-bootstrap-repo/opendesk-nextcloud-bootstrap"
|
||||||
version: "3.0.0"
|
version: "3.1.0"
|
||||||
wait: true
|
wait: true
|
||||||
waitForJobs: true
|
waitForJobs: true
|
||||||
values:
|
values:
|
||||||
|
|||||||
@@ -3,7 +3,6 @@
|
|||||||
---
|
---
|
||||||
bases:
|
bases:
|
||||||
- "../../bases/environments.yaml"
|
- "../../bases/environments.yaml"
|
||||||
---
|
|
||||||
|
|
||||||
repositories:
|
repositories:
|
||||||
- name: "univention"
|
- name: "univention"
|
||||||
|
|||||||
@@ -7,7 +7,7 @@ images:
|
|||||||
tag: "1.1.1-10_base@sha256:aed8d5a3ef58352c862028fae44241215a50eae0b9acb7ba8892b1edc0a6598f"
|
tag: "1.1.1-10_base@sha256:aed8d5a3ef58352c862028fae44241215a50eae0b9acb7ba8892b1edc0a6598f"
|
||||||
collabora:
|
collabora:
|
||||||
repository: "souvap/tooling/images/collabora"
|
repository: "souvap/tooling/images/collabora"
|
||||||
tag: "23.05.3.1.1@sha256:f1248a50e67940e3be3dfa58dc37eca73267cf73a679b459707d2520cee7720e"
|
tag: "23.05.4.2.1@sha256:ee9ce83811700f1ff57e1218d22388dbaca96306df33f82aa14b334c5302285a"
|
||||||
dovecot:
|
dovecot:
|
||||||
repository: "dovecot/dovecot"
|
repository: "dovecot/dovecot"
|
||||||
tag: "2.3.20@sha256:96d414aa3f6978669b417f6468c16313a54ee6143a4846870e9f0eda280806e7"
|
tag: "2.3.20@sha256:96d414aa3f6978669b417f6468c16313a54ee6143a4846870e9f0eda280806e7"
|
||||||
|
|||||||
Reference in New Issue
Block a user