-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
- Loading branch information
Showing
29 changed files
with
1,280 additions
and
3,517 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,8 +1,31 @@ | ||
| MAKEFILES_VERSION=7.5.0 | ||
| MAKEFILES_VERSION=7.6.0 | ||
|
|
||
| .DEFAULT_GOAL:=dogu-release | ||
|
|
||
| include build/make/variables.mk | ||
| include build/make/self-update.mk | ||
| include build/make/release.mk | ||
| include build/make/bats.mk | ||
| include build/make/bats.mk | ||
| include build/make/version-sha.mk | ||
|
|
||
| CAS_PLUGIN_VERSION=v$(shell grep CAS_PLUGIN_VERSION= Dockerfile | sed 's/.*CAS_PLUGIN_VERSION=\([^ ]*\).*/\1/g') | ||
| CLOUDOGU_THEME_VERSION=$(shell grep CLOUDOGU_THEME_VERSION= Dockerfile | sed 's/.*CLOUDOGU_THEME_VERSION=\([^ ]*\).*/\1/g') | ||
| SESSION_STORE_VERSION=v$(shell grep ACTIVERECORD_SESSION_STORE_PLUGIN_VERSION= Dockerfile | sed 's/.*ACTIVERECORD_SESSION_STORE_PLUGIN_VERSION=\([^ ]*\).*/\1/g') | ||
| API_PLUGIN_VERSION=v$(shell grep EXTENDED_REST_API_PLUGIN_VERSION= Dockerfile | sed 's/.*EXTENDED_REST_API_PLUGIN_VERSION=\([^ ]*\).*/\1/g') | ||
| RUBYCAS_VERSION=v$(shell grep RUBYCASVERSION= Dockerfile | sed 's/.*RUBYCASVERSION=\([^ ]*\).*/\1/g') | ||
| REDMINE_VERSION=$(shell grep REDMINE_VERSION= Dockerfile | sed 's/.*REDMINE_VERSION=\([^ ]*\).*/\1/g') | ||
|
|
||
| .PHONY: sums | ||
| sums: ## Print out all versions | ||
| @echo "Cas Plugin" | ||
| @make --no-print-directory sha-sum SHA_SUM_REPOSITORY=redmine_cas SHA_SUM_VERSION=${CAS_PLUGIN_VERSION} | ||
| @echo "Cloudogu Theme" | ||
| @make --no-print-directory sha-sum SHA_SUM_URL="https://github.com/cloudogu/PurpleMine2/releases/download/v${CLOUDOGU_THEME_VERSION}/CloudoguRedmineTheme-${CLOUDOGU_THEME_VERSION}.tar.gz" | ||
| @echo "Sessionstore Plugin" | ||
| @make --no-print-directory sha-sum SHA_SUM_REPOSITORY=redmine_activerecord_session_store SHA_SUM_VERSION=${SESSION_STORE_VERSION} | ||
| @echo "Rest API Plugin" | ||
| @make --no-print-directory sha-sum SHA_SUM_REPOSITORY=redmine_extended_rest_api SHA_SUM_VERSION=${API_PLUGIN_VERSION} | ||
| @echo "Rubycas-client-version" | ||
| @make --no-print-directory sha-sum SHA_SUM_REPOSITORY=rubycas-client SHA_SUM_VERSION=${RUBYCAS_VERSION} | ||
| @echo "Redmine-client-version" | ||
| @make --no-print-directory sha-sum SHA_SUM_URL="https://www.redmine.org/releases/redmine-${REDMINE_VERSION}.tar.gz" |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,18 @@ | ||
| ##@ Version | ||
|
|
||
| # This makefile is used to get the sha256sum of a specific github tag-src.tar.gz or .zip. | ||
| # You may set any of the following variables before your make call to change the hash url. | ||
|
|
||
| SHA_SUM_ORGANISATION?="cloudogu" | ||
| SHA_SUM_REPOSITORY?="ecosystem" | ||
| SHA_SUM_FILE_TYPE?="tar.gz" | ||
| SHA_SUM_VERSION?="v20.04.4-2" | ||
| SHA_SUM_URL?="https://github.com/${SHA_SUM_ORGANISATION}/${SHA_SUM_REPOSITORY}/archive/refs/tags/${SHA_SUM_VERSION}.${SHA_SUM_FILE_TYPE}" | ||
|
|
||
| .PHONY: sha-sum | ||
| sha-sum: ## Print out the version | ||
| @echo "Downloading from: ${SHA_SUM_URL}" | ||
| @wget -O - -o /dev/null "${SHA_SUM_URL}" > .download.for.hash \ | ||
| || (echo "Could not be downloaded" && exit 1) \ | ||
| && cat .download.for.hash | sha256sum | ||
| @rm -f .download.for.hash |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,8 @@ | ||
| # Entwicklerhinweise zum CAS-Plugin und dem Session-Store | ||
| Seit Redmine 5.x und dem damit verbundenen Wechsel auf Rails 6 wurde etwas am Initialisierungsmechanismus der Plugins geändert. | ||
| Dies führte dazu, dass das `redmine_activerecord_session_store`-Plugin nicht mehr alleine lauffähig war. | ||
| Die Konfiguration des Session-Stores wurde nicht mehr angezogen. | ||
| Dafür war es notwendig, zusätzlich die Datei `resources/usr/share/webapps/redmine/config/initializers/session_store.rb` hinzuzufügen. | ||
| Ohne diese Datei mit dem Aufruf `Rails.application.config.session_store :active_record_store` wurde von Redmine der Session-Store nicht mehr erkannt. | ||
| Diese Konfiguration ist wichtig, damit der Backchannel-Logout bei Redmine funktioniert. Bei Weiterentwicklungen und damit möglicherweise auftretenden | ||
| Problemen könnte es sinnvoll sein, diesen Mechanismus noch einmal zu überarbeiten. |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,8 @@ | ||
| # Developer notes on the CAS plugin and the session store. | ||
| Since Redmine 5.x and the associated change to Rails 6, something was changed in the initialization mechanism of the plugins. | ||
| This resulted in the `redmine_activerecord_session_store` plugin no longer being able to run on its own. | ||
| The configuration of the session store was no longer attracted. | ||
| For this it was necessary to add the `resources/usr/share/webapps/redmine/config/initializers/session_store.rb` additionally. | ||
| Without this with the call `Rails.application.config.session_store :active_record_store` the session store was no longer recognized by Redmine. | ||
| This configuration is important for the backchannel logout to work with Redmine. In case of further developments and problems that might occur | ||
| problems, it could be useful to revise this mechanism again. |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,37 @@ | ||
| const doguTestLibrary = require('@cloudogu/dogu-integration-test-library'); | ||
| const { defineConfig } = require('cypress'); | ||
| const createBundler = require("@bahmutov/cypress-esbuild-preprocessor"); | ||
| const preprocessor = require("@badeball/cypress-cucumber-preprocessor"); | ||
| const createEsbuildPlugin = require("@badeball/cypress-cucumber-preprocessor/esbuild"); | ||
|
|
||
| async function setupNodeEvents(on, config) { | ||
| // This is required for the preprocessor to be able to generate JSON reports after each run, and more, | ||
| await preprocessor.addCucumberPreprocessorPlugin(on, config); | ||
|
|
||
| on( | ||
| "file:preprocessor", | ||
| createBundler({ | ||
| plugins: [createEsbuildPlugin.default(config)], | ||
| }) | ||
| ); | ||
|
|
||
| config = doguTestLibrary.configure(config); | ||
|
|
||
| return config; | ||
| } | ||
|
|
||
| module.exports = defineConfig({ | ||
| e2e: { | ||
| baseUrl: 'https://192.168.56.2', | ||
| env: { | ||
| "DoguName": "redmine", | ||
| "MaxLoginRetries": 3, | ||
| "AdminUsername": "ces-admin", | ||
| "AdminPassword": "ecosystem2016", | ||
| "AdminGroup": "CesAdministrators" | ||
| }, | ||
| videoCompression: false, | ||
| specPattern: ["cypress/e2e/**/*.feature"], | ||
| setupNodeEvents, | ||
| }, | ||
| }); |
This file was deleted.
Oops, something went wrong.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
This file was deleted.
Oops, something went wrong.
File renamed without changes.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
2 changes: 1 addition & 1 deletion
2
integrationTests/cypress/support/step_definitions/redmine_administration_rest.js
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.