Create volume for /tmp

CHANGELOG.md

@@ -4,10 +4,24 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
+## Unreleased
+### Fixed
+- Volume for temporary folder ([#82](https://github.com/cloudogu/scm/pull/82))
+
+## Unreleased
+### Changed
+- Use Java 17 base image ([#77](https://github.com/cloudogu/scm/pull/77))
+### Fixed
+- [#78] Integration tests after upgrading CAS
+
 ## [2.44.2-2]
 ### Added
 - [#72] Configuration options for resource requirements
 - [#72] Defaults for CPU and memory requests
+- Configuration options for store caches ([#75](https://github.com/cloudogu/scm/pull/75))
+### Removed
+- Default Plugins ([#70](https://github.com/cloudogu/scm/pull/70))
+
 
 ## [2.44.2-1]
 ### Changed

Dockerfile

@@ -1,12 +1,12 @@
-FROM registry.cloudogu.com/official/java:11.0.14-3
+FROM registry.cloudogu.com/official/java:17.0.6-2
 LABEL maintainer="[email protected]"
 
 ARG SCM_PKG_URL=https://packages.scm-manager.org/repository/releases/sonia/scm/packaging/unix/2.44.2/unix-2.44.2.tar.gz
 ARG SCM_PKG_SHA256=ded6caa5635145b32111ee719c86691d2d591b6865e6f9ffc86c690f5d3dd6ca
 ARG SCM_CODE_EDITOR_PLUGIN_URL=https://packages.scm-manager.org/repository/plugin-releases/sonia/scm/plugins/scm-code-editor-plugin/1.1.0/scm-code-editor-plugin-1.1.0.smp
 ARG SCM_CODE_EDITOR_PLUGIN_SHA256=0029893e1878d98d7df1e513227041ce5a59980e40c81be35bcc3a1fafe0a521
-ARG SCM_SCRIPT_PLUGIN_URL=https://packages.scm-manager.org/repository/plugin-releases/sonia/scm/plugins/scm-script-plugin/2.4.0/scm-script-plugin-2.4.0.smp
-ARG SCM_SCRIPT_PLUGIN_SHA256=65a025ac4f002386bcf83a18123ee589333adca79a428112ac455ff92ab0489e
+ARG SCM_SCRIPT_PLUGIN_URL=https://packages.scm-manager.org/repository/plugin-releases/sonia/scm/plugins/scm-script-plugin/2.5.0/scm-script-plugin-2.5.0.smp
+ARG SCM_SCRIPT_PLUGIN_SHA256=4ab4abf6465b392982f5656d8898366e5310050d84bcfa400601e3c27f37fd4d
 ARG SCM_CAS_PLUGIN_URL=https://packages.scm-manager.org/repository/plugin-releases/sonia/scm/plugins/scm-cas-plugin/2.4.0/scm-cas-plugin-2.4.0.smp
 ARG SCM_CAS_PLUGIN_SHA256=bd9a0e0794fb1be40f357cbbde7396889055bd1af2c42b4f2cdb34763c5fb372
 ARG SCM_CES_PLUGIN_URL=https://packages.scm-manager.org/repository/plugin-releases/sonia/scm/plugins/scm-ces-plugin/1.0.1/scm-ces-plugin-1.0.1.smp
@@ -26,7 +26,7 @@ ENV SCM_HOME=/var/lib/scm \
 RUN set -x -o errexit -o nounset -o pipefail \
     && apk update \
     && apk upgrade \
-    && apk add --no-cache graphviz ttf-dejavu mercurial jq unzip \
+    && apk add --no-cache graphviz ttf-dejavu mercurial jq unzip curl \
     && curl --fail  -Lks ${SCM_PKG_URL} -o /tmp/scm-server.tar.gz \
     && echo "${SCM_PKG_SHA256} */tmp/scm-server.tar.gz" | sha256sum -c - \
     && addgroup -S -g 1000 scm \

Jenkinsfile

@@ -121,7 +121,7 @@ node('vagrant') {
                 }
 
                 stage('e2e Tests') {
-                    ecoSystem.runCypressIntegrationTests([cypressImage: "cypress/included:8.6.0", enableVideo: true, enableScreenshots: true])
+                    ecoSystem.runCypressIntegrationTests([cypressImage: "cypress/included:12.17.1", enableVideo: true, enableScreenshots: true])
                 }
 
                 stage('Push changes to remote repository') {

dogu.json

@@ -182,6 +182,18 @@
             "Validation": {
                 "Type": "BINARY_MEASUREMENT"
             }
+        },
+        {
+            "Name": "caching/stores/enabled",
+            "Description": "To enable store caches, set this to 'true'.",
+            "Optional": true,
+            "Default": "false"
+        },
+        {
+            "Name": "caching/dataFiles/size",
+            "Description": "To enable data file caches, set this to an integer value > 0.",
+            "Optional": true,
+            "Default": "0"
         }
     ],
     "ExposedPorts": [
@@ -227,15 +239,22 @@
             "NeedsBackup": true
         },
         {
-            "Name": "temp",
+            "Name": "cache",
             "Path": "/var/cache",
             "Owner": "1000",
             "Group": "1000",
             "NeedsBackup": false
+        },
+        {
+            "Name": "temp",
+            "Path": "/tmp",
+            "Owner": "1000",
+            "Group": "1000",
+            "NeedsBackup": false
         }
     ],
     "HealthCheck": {
         "Type": "tcp",
         "Port": 8080
     }
-}
+}

integrationTests/.gitignore

@@ -0,0 +1,3 @@
+node_modules
+cypress/videos
+cypress/screenshots

integrationTests/cypress.config.js

@@ -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": "scm",
+            "MaxLoginRetries": 3,
+            "AdminUsername": "ces-admin",
+            "AdminPassword": "ecosystem2016",
+            "AdminGroup": "CesAdministrators"
+        },
+        videoCompression: false,
+        specPattern: ["cypress/e2e/**/*.feature"],
+        setupNodeEvents,
+    },
+});

integrationTests/cypress/integration/dogu_integration_test_lib/cas_browser.feature → integrationTests/cypress/e2e/dogu_integration_test_lib/cas_browser.feature

@@ -11,16 +11,14 @@ Feature: Browser-based CAS login and logout functionality
   Scenario: logged out user can log in to the dogu
     Given the user is logged out of the CES
     When the user opens the dogu start page
-    And the user types in correct login credentials
-    And the user clicks the login button
+    And the test user logs in with correct credentials
     Then the user is logged in to the dogu
 
   @requires_testuser
   Scenario: logged out user can not log in to the dogu with wrong credentials
     Given the user is logged out of the CES
     When the user opens the dogu start page
-    And the user types in wrong login credentials
-    And the user clicks the login button
+    And the user logs in with wrong credentials
     Then the login page informs the user about invalid credentials
 
   @requires_testuser

integrationTests/cypress/support/step_definitions/dogu_integration_test_library_steps.js

@@ -1,3 +1,7 @@
+const {
+    When, Then
+} = require("@badeball/cypress-cucumber-preprocessor");
+
 // Loads all steps from the dogu integration library into this project
 const doguTestLibrary = require('@cloudogu/dogu-integration-test-library')
 doguTestLibrary.registerSteps()

integrationTests/cypress/support/step_definitions/scm_api.js

@@ -1,4 +1,4 @@
-const { Then } = require("cypress-cucumber-preprocessor/steps");
+const { Then } = require("@badeball/cypress-cucumber-preprocessor");
 
 Then("the user can access the index", () => {
   cy.getIndex().then((response) => {

integrationTests/package.json

@@ -1,11 +1,13 @@
 {
   "license": "MIT",
   "dependencies": {
-    "cypress": "8.6.0",
-    "cypress-cucumber-preprocessor": "4.1.0",
-    "@cloudogu/dogu-integration-test-library": "1.0.0"
+    "@badeball/cypress-cucumber-preprocessor": "^16.0.0",
+    "@bahmutov/cypress-esbuild-preprocessor": "^2.2.0",
+    "@cloudogu/dogu-integration-test-library": "6.0.1",
+    "cypress": "^12.9.0",
+    "@bahmutov/cy-api": "^2.2.4"
   },
   "scripts": {
-    "updateTests": "mkdir -p cypress/integration/dogu_integration_test_lib && cp -r node_modules/@cloudogu/dogu-integration-test-library/lib/integration/* cypress/integration/dogu_integration_test_lib"
+    "updateTests": "mkdir -p cypress/e2e/dogu_integration_test_lib && cp -r node_modules/@cloudogu/dogu-integration-test-library/lib/integration/* cypress/e2e/dogu_integration_test_lib"
   }
 }