Merge branch 'release-0.52.x' into update/scalacheck-1.17.1

SwissDataScienceCenter · Apr 17, 2024 · 1c02128 · 1c02128
2 parents 553671a + 6e8eabc
commit 1c02128
Show file tree

Hide file tree

Showing 12 changed files with 47 additions and 25 deletions.
diff --git a/.github/workflows/pull-request-test.yml b/.github/workflows/pull-request-test.yml
@@ -135,7 +135,6 @@ jobs:
 
     strategy:
       fail-fast: false
-      max-parallel: 1
       matrix:
         tests:
           [

diff --git a/CHANGELOG.rst b/CHANGELOG.rst
@@ -1,5 +1,10 @@
 .. _changelog:
 
+0.52.x
+------
+
+
+
 0.51.0
 ------
 

diff --git a/acceptance-tests/build.sbt b/acceptance-tests/build.sbt
@@ -30,7 +30,7 @@ publishTo := Some(Resolver.file("Unused transient repository", file("target/unus
 
 val circeVersion = "0.14.6"
 
-libraryDependencies += "ch.qos.logback"          % "logback-classic"               % "1.5.3"
+libraryDependencies += "ch.qos.logback"          % "logback-classic"               % "1.5.5"
 libraryDependencies += "com.github.pureconfig"  %% "pureconfig"                    % "0.17.6"     % Test
 libraryDependencies += "eu.timepit"             %% "refined"                       % "0.11.1"     % Test
 libraryDependencies += "io.circe"               %% "circe-core"                    % circeVersion % Test
@@ -44,7 +44,7 @@ libraryDependencies += "org.scalatest"          %% "scalatest"
 libraryDependencies += "org.scalatestplus"      %% "selenium-4-1"                  % "3.2.12.1"   % Test
 libraryDependencies += "org.seleniumhq.selenium" % "selenium-http-jdk-client"      % "4.13.0"     % Test
 libraryDependencies += "org.seleniumhq.selenium" % "selenium-java"                 % "4.18.1"     % Test
-libraryDependencies += "org.slf4j"               % "slf4j-log4j12"                 % "2.0.12"     % Test
+libraryDependencies += "org.slf4j"               % "slf4j-log4j12"                 % "2.0.13"     % Test
 libraryDependencies += "org.typelevel"          %% "cats-effect"                   % "3.5.4"      % Test
 libraryDependencies += "org.typelevel"          %% "cats-effect-testing-scalatest" % "1.5.0"      % Test
 

diff --git a/cypress-tests/cypress/e2e/checkWorkflows.cy.ts b/cypress-tests/cypress/e2e/checkWorkflows.cy.ts
@@ -1,17 +1,19 @@
 import { TIMEOUTS } from "../../config";
 import { ProjectIdentifier } from "../support/commands/projects";
-import { validateLogin } from "../support/commands/general";
+import { validateLogin, getRandomString } from "../support/commands/general";
 
 const project: ProjectIdentifier = {
   namespace: "renku-ui-tests",
   name: "composite-workflows",
 };
 
+const sessionId = ["checkWorkflows", getRandomString()];
+
 describe("Workflows pages", () => {
   before(() => {
     // Use a session to preserve login data
     cy.session(
-      "login-updateProjects",
+      sessionId,
       () => {
         cy.robustLogin();
       },
@@ -22,7 +24,7 @@ describe("Workflows pages", () => {
   beforeEach(() => {
     // Restore the session
     cy.session(
-      "login-updateProjects",
+      sessionId,
       () => {
         cy.robustLogin();
       },

diff --git a/cypress-tests/cypress/e2e/privateProject.cy.ts b/cypress-tests/cypress/e2e/privateProject.cy.ts
@@ -3,7 +3,7 @@ import {
   ProjectIdentifier,
   generatorProjectName,
 } from "../support/commands/projects";
-import { validateLogin } from "../support/commands/general";
+import { validateLogin, getRandomString } from "../support/commands/general";
 
 const username = Cypress.env("TEST_USERNAME");
 
@@ -21,11 +21,13 @@ const projectIdentifier: ProjectIdentifier = {
   namespace: username,
 };
 
+const sessionId = ["privateProject", getRandomString()];
+
 describe("Basic public project functionality", () => {
   before(() => {
     // Use a session to preserve login data
     cy.session(
-      "login-publicProject",
+      sessionId,
       () => {
         cy.robustLogin();
       },
@@ -46,7 +48,7 @@ describe("Basic public project functionality", () => {
   beforeEach(() => {
     // Restore the session
     cy.session(
-      "login-publicProject",
+      sessionId,
       () => {
         cy.robustLogin();
       },

diff --git a/cypress-tests/cypress/e2e/publicProject.cy.ts b/cypress-tests/cypress/e2e/publicProject.cy.ts
@@ -4,7 +4,7 @@ import {
   generatorProjectName,
   projectUrlFromIdentifier,
 } from "../support/commands/projects";
-import { validateLogin } from "../support/commands/general";
+import { validateLogin, getRandomString } from "../support/commands/general";
 
 const username = Cypress.env("TEST_USERNAME");
 
@@ -22,11 +22,13 @@ const projectIdentifier: ProjectIdentifier = {
   namespace: username,
 };
 
+const sessionId = ["publicProject", getRandomString()];
+
 describe("Basic public project functionality", () => {
   before(() => {
     // Use a session to preserve login data
     cy.session(
-      "login-publicProject",
+      sessionId,
       () => {
         cy.robustLogin();
       },
@@ -43,7 +45,7 @@ describe("Basic public project functionality", () => {
   beforeEach(() => {
     // Restore the session
     cy.session(
-      "login-publicProject",
+      sessionId,
       () => {
         cy.robustLogin();
       },

diff --git a/cypress-tests/cypress/e2e/rstudioSession.cy.ts b/cypress-tests/cypress/e2e/rstudioSession.cy.ts
@@ -5,7 +5,7 @@ import {
   ProjectIdentifier,
   generatorProjectName,
 } from "../support/commands/projects";
-import { validateLogin } from "../support/commands/general";
+import { validateLogin, getRandomString } from "../support/commands/general";
 
 const username = Cypress.env("TEST_USERNAME");
 
@@ -23,11 +23,13 @@ const projectIdentifier: ProjectIdentifier = {
   namespace: username,
 };
 
+const sessionId = ["rstudioSession", getRandomString()];
+
 describe("Basic rstudio functionality", () => {
   before(() => {
     // Use a session to preserve login data
     cy.session(
-      "login-rstudioSession",
+      sessionId,
       () => {
         cy.robustLogin();
       },
@@ -49,7 +51,7 @@ describe("Basic rstudio functionality", () => {
   beforeEach(() => {
     // Restore the session
     cy.session(
-      "login-rstudioSession",
+      sessionId,
       () => {
         cy.robustLogin();
       },

diff --git a/cypress-tests/cypress/e2e/testDatasets.cy.ts b/cypress-tests/cypress/e2e/testDatasets.cy.ts
@@ -3,7 +3,7 @@ import {
   ProjectIdentifier,
   generatorProjectName,
 } from "../support/commands/projects";
-import { validateLogin } from "../support/commands/general";
+import { validateLogin, getRandomString } from "../support/commands/general";
 import { generatorDatasetName } from "../support/commands/datasets";
 
 const username = Cypress.env("TEST_USERNAME");
@@ -23,11 +23,13 @@ const projectIdentifier: ProjectIdentifier = {
 };
 const generatedDatasetName = generatorDatasetName("Dataset");
 
+const sessionId = ["testDatasets", getRandomString()];
+
 describe("Basic datasets functionality", () => {
   before(() => {
     // Use a session to preserve login data
     cy.session(
-      "login-publicProject",
+      sessionId,
       () => {
         cy.robustLogin();
       },
@@ -49,7 +51,7 @@ describe("Basic datasets functionality", () => {
   beforeEach(() => {
     // Restore the session
     cy.session(
-      "login-publicProject",
+      sessionId,
       () => {
         cy.robustLogin();
       },

diff --git a/cypress-tests/cypress/e2e/updateProjects.cy.ts b/cypress-tests/cypress/e2e/updateProjects.cy.ts
@@ -1,5 +1,5 @@
 import { TIMEOUTS } from "../../config";
-import { validateLogin } from "../support/commands/general";
+import { validateLogin, getRandomString } from "../support/commands/general";
 import { generatorProjectName } from "../support/commands/projects";
 
 const username = Cypress.env("TEST_USERNAME");
@@ -18,11 +18,13 @@ const projects = {
 // projects.v8 = "anotherProjectV8";
 // projects.v9 = "anotherProjectV9";
 
+const sessionId = ["updateProjects", getRandomString()];
+
 describe("Fork and update old projects", () => {
   before(() => {
     // Use a session to preserve login data
     cy.session(
-      "login-updateProjects",
+      sessionId,
       () => {
         cy.robustLogin();
       },
@@ -33,7 +35,7 @@ describe("Fork and update old projects", () => {
   beforeEach(() => {
     // Restore the session
     cy.session(
-      "login-updateProjects",
+      sessionId,
       () => {
         cy.robustLogin();
       },

diff --git a/cypress-tests/cypress/e2e/useSession.cy.ts b/cypress-tests/cypress/e2e/useSession.cy.ts
@@ -1,6 +1,6 @@
 import { TIMEOUTS } from "../../config";
 import { generatorProjectName } from "../support/commands/projects";
-import { validateLogin } from "../support/commands/general";
+import { validateLogin, getRandomString } from "../support/commands/general";
 import { v4 as uuidv4 } from "uuid";
 
 const username = Cypress.env("TEST_USERNAME");
@@ -24,11 +24,13 @@ const projectWithoutPermissions = {
   name: "stable-project",
 };
 
+const sessionId = ["useSession", getRandomString()];
+
 describe("Basic public project functionality", () => {
   before(() => {
     // Use a session to preserve login data
     cy.session(
-      "login-useSession",
+      sessionId,
       () => {
         cy.robustLogin();
       },
@@ -50,7 +52,7 @@ describe("Basic public project functionality", () => {
   beforeEach(() => {
     // Restore the session
     cy.session(
-      "login-useSession",
+      sessionId,
       () => {
         cy.robustLogin();
       },

diff --git a/cypress-tests/cypress/support/commands/general.ts b/cypress-tests/cypress/support/commands/general.ts
@@ -24,6 +24,10 @@ function getDataCy(value: string, exist?: boolean) {
   return cy.get(`[data-cy=${value}]`);
 }
 
+export function getRandomString(length: number=8) {
+  return Math.random().toString(20).substr(2, length)
+}
+
 export default function registerGeneralCommands() {
   Cypress.Commands.add("getIframe", getIframe);
   Cypress.Commands.add("getDataCy", getDataCy);

diff --git a/scripts/init-realm/requirements.txt b/scripts/init-realm/requirements.txt
@@ -1 +1 @@
-python-keycloak==3.9.1
+python-keycloak==3.11.1
-Original file line number
+Diff line change
@@ Expand Up / @@ -135,7 +135,6 @@ jobs: @@
         strategy:
           fail-fast: false
-          max-parallel: 1
           matrix:
             tests:
               [
@@ Expand Down @@