Merge branch 'release-0.49.0' into renku-data-services-users-db

SwissDataScienceCenter · Feb 28, 2024 · 7fecfbe · 7fecfbe
2 parents 3935a2e + b7cf6b9
commit 7fecfbe
Show file tree

Hide file tree

Showing 24 changed files with 307 additions and 147 deletions.
diff --git a/.github/workflows/auto-reqs-update-pr.yml b/.github/workflows/auto-reqs-update-pr.yml
@@ -1,8 +1,6 @@
 name: Automatic requirements.yml update PR
 on:
-  push:
-    branches:
-      - 'auto-update/**'
+  workflow_dispatch
 jobs:
   auto-pull-request:
     runs-on: ubuntu-latest

diff --git a/.github/workflows/publish-helm-chart.yml b/.github/workflows/publish-helm-chart.yml
@@ -40,16 +40,3 @@ jobs:
         if: always()
     outputs:
       chart-version: ${{ steps.vars.outputs.tag }}
-  rollout-renku-deployments:
-    runs-on: ubuntu-20.04
-    needs:
-      - "publish-chart"
-    steps:
-      - uses: actions/[email protected]
-        with:
-          fetch-depth: 0
-      - name: Rollout renku version
-        uses: SwissDataScienceCenter/renku-actions/[email protected]
-        env:
-          CHART_VERSION: ${{ needs.publish-chart.outputs.chart-version }}
-          GITHUB_TOKEN: ${{ secrets.RENKUBOT_GITHUB_TOKEN }}
diff --git a/.github/workflows/release-test.yml b/.github/workflows/release-test.yml
@@ -0,0 +1,28 @@
+name: Check release branch
+on:
+  workflow_dispatch:
+  pull_request:
+    types: [opened,closed,synchronize,edited,review_requested,reopened]
+    branches:
+      - master
+  pull_request_review:
+    types: [submitted]
+jobs:
+  check-open-prs:
+    if: startsWith(github.event.pull_request.head.ref, 'release-')
+    runs-on: ubuntu-latest
+    steps:
+      - name: Check unmerged PRs
+        uses: actions/github-script@v7
+        with:
+          script: |
+            const prs = await github.rest.pulls.list({
+              owner: context.repo.owner,
+              repo: context.repo.repo,
+              base: context.payload.pull_request.head.ref,
+              state: 'open'
+            })
+            const prs_filtered = prs.data.filter((p)=>!p.draft)
+            if ( prs_filtered.length > 0 ) {
+              core.setFailed('There are umerged open PRs targetting this branch:\n'+prs_filtered.map((p)=>p.title + ' ( ' + p.html_url + ' )').join('\n'))
+            }
diff --git a/.github/workflows/renku-dev-test.yaml b/.github/workflows/renku-dev-test.yaml
@@ -23,7 +23,7 @@ jobs:
     runs-on: ubuntu-20.04
     steps:
       - uses: actions/[email protected]
-      - uses: cypress-io/github-action@v5
+      - uses: cypress-io/github-action@v6
         id: cypress
         env:
           TEST_EMAIL: [email protected]

diff --git a/CHANGELOG.rst b/CHANGELOG.rst
@@ -1,22 +1,91 @@
 .. _changelog:
 
+0.49.0
+------
+
+This release contains bug fixes to renku core service related to project migration.
+
+User-Facing Changes
+~~~~~~~~~~~~~~~~~~~
+
+**🐞 Bug Fixes**
+
+- **Core Service**: Fix issue with having to run project migration twice to migrate the Dockerfile/project template.
+
+Individual Components
+~~~~~~~~~~~~~~~~~~~~~
+
+- `renku-python 2.9.2 <https://github.com/SwissDataScienceCenter/renku-python/releases/tag/2.9.2>`_
+
+0.48.1
+------
+
+Renku ``0.48.1`` only changes how the Terms of Use and Privacy Policy sections
+can be customized by administrators.
+
+0.48.0
+------
+
+Renku ``0.48.0`` introduces the ability to add a Terms of Use and Privacy Policy to
+RenkuLab, as well as an assortment of small improvements and bug-fixes.
+
+User-Facing Changes
+~~~~~~~~~~~~~~~~~~~
+
+**🌟 New Features**
+
+- 📜 **UI**: Show terms of use and privacy policy in the help section
+  (`#2954 <https://github.com/SwissDataScienceCenter/renku-ui/pull/2954>`_).
+
+**✨ Improvements**
+
+- 🖌 **UI**: Improve appearance of templates on new project page
+  (`#2999 <https://github.com/SwissDataScienceCenter/renku-ui/pull/2999>`_).
+- 🛑 **UI**: Unify appearance of project settings alerts
+  (`#3001 <https://github.com/SwissDataScienceCenter/renku-ui/pull/3001>`_).
+
+**🐞 Bug Fixes**
+
+- **UI**: Restore logged in/out notifications
+  (`#3014 <https://github.com/SwissDataScienceCenter/renku-ui/pull/3014>`_).
+- **UI**: Hide button to add storage on deployments not supporting external storages
+  (`#3001 <https://github.com/SwissDataScienceCenter/renku-ui/pull/3001>`_).
+- **UI**: Fix landing page parallax background (`#3010 <https://github.com/SwissDataScienceCenter/renku-ui/pull/3010>`_).
+- **UI**: Fix search bar styles (`#3019 <https://github.com/SwissDataScienceCenter/renku-ui/pull/3019>`_).
+- **UI**: Handle ``jsonrpc`` improper redirects (`#3017 <https://github.com/SwissDataScienceCenter/renku-ui/pull/3017>`_, `#2966 <https://github.com/SwissDataScienceCenter/renku-ui/issues/2966>`_).
+
+Internal Changes
+~~~~~~~~~~~~~~~~
+
+**Improvements**
+
+- **UI**: Add initial alpha implementation of Renku 1.0 projects
+  (`#2875 <https://github.com/SwissDataScienceCenter/renku-ui/pull/2875>`_).
+
+Individual components
+~~~~~~~~~~~~~~~~~~~~~~
+
+- `renku-ui 3.20.1 <https://github.com/SwissDataScienceCenter/renku-ui/releases/tag/3.20.1>`_
+- `renku-ui 3.20.0 <https://github.com/SwissDataScienceCenter/renku-ui/releases/tag/3.20.0>`_
+
 0.47.1
 ------
 
 This release only includes changes to the documentation and updates to the acceptance tests.
 It doesn't bring any new features or bug fixes.
 
+
 0.47.0
 ------
 
 This release expands Renku's cloud storage functionality in two key ways: First, mounted storages
 are now read **and write**, so you can use mounted storage as an active workspace for your data in a RenkuLab
 session. Second, we have expanded the cloud storage services you can integrate with RenkuLab. You can now
-mount not only S3 buckets, but also WebDAV-based storages and Azure Blobs. 
- 
+mount not only S3 buckets, but also WebDAV-based storages and Azure Blobs.
+
 If you use SSH sessions via the CLI, you can use cloud storage there too! Configure cloud storage for your
 project on RenkuLab.io, and those storages will be mounted in your remote session. Support for cloud
-storage in local Renku sessions is still on our roadmap. 
+storage in local Renku sessions is still on our roadmap.
 
 This release also adds the ability to change which resource class your session uses when you unpause the
 session, in case the original resource class is now full.
@@ -147,15 +216,15 @@ Internal Changes
 Individual components
 ~~~~~~~~~~~~~~~~~~~~~
 
-- `renku-python 2.8.2 <https://github.com/SwissDataScienceCenter/renku-python/releases/tag/2.8.2>`_ 
+- `renku-python 2.8.2 <https://github.com/SwissDataScienceCenter/renku-python/releases/tag/2.8.2>`_
 - `renku-ui 3.17.2 <https://github.com/SwissDataScienceCenter/renku-ui/releases/tag/3.17.2>`_
-- `renku-graph 2.48.2 <https://github.com/SwissDataScienceCenter/renku-graph/releases/tag/2.48.2>`_ 
+- `renku-graph 2.48.2 <https://github.com/SwissDataScienceCenter/renku-graph/releases/tag/2.48.2>`_
 
 
 0.45.1
 ------
-This is a bugfix release that updates the helm chart to work with new 
-prometheus metrics in the renku core service, which was preventing it from 
+This is a bugfix release that updates the helm chart to work with new
+prometheus metrics in the renku core service, which was preventing it from
 starting properly if metrics were enabled. In addition this release
 also addresses problems with expiring Gitlab access tokens when sessions
 are paused and resumed which caused resumed session to not be able to push to Gitlab
@@ -166,8 +235,8 @@ Internal Changes
 
 **🐞 Bug Fixes**
 
-- **Helm Chart**: update core-service deployment to allow service and rq 
-  metrics to run side-by-side (`#3303 
+- **Helm Chart**: update core-service deployment to allow service and rq
+  metrics to run side-by-side (`#3303
   <https://github.com/SwissDataScienceCenter/renku/pull/3303>`_).
 - **Notebooks**: use a larger /dev/shm folder in sessions
   (`#1723 <https://github.com/SwissDataScienceCenter/renku-notebooks/issues/1723>`_)

diff --git a/acceptance-tests/.scalafmt.conf b/acceptance-tests/.scalafmt.conf
@@ -1,4 +1,4 @@
-version = "3.7.17"
+version = "3.8.0"
 
 runner.dialect = "scala213"
 

diff --git a/acceptance-tests/build.sbt b/acceptance-tests/build.sbt
@@ -19,7 +19,7 @@
 organization := "ch.renku"
 name := "renku-acceptance-tests"
 version := "0.1.0"
-scalaVersion := "2.13.12"
+scalaVersion := "2.13.13"
 
 Test / parallelExecution := false
 
@@ -30,8 +30,8 @@ publishTo := Some(Resolver.file("Unused transient repository", file("target/unus
 
 val circeVersion = "0.14.6"
 
-libraryDependencies += "ch.qos.logback"          % "logback-classic"               % "1.4.14"
-libraryDependencies += "com.github.pureconfig"  %% "pureconfig"                    % "0.17.5"     % Test
+libraryDependencies += "ch.qos.logback"          % "logback-classic"               % "1.5.0"
+libraryDependencies += "com.github.pureconfig"  %% "pureconfig"                    % "0.17.6"     % Test
 libraryDependencies += "eu.timepit"             %% "refined"                       % "0.11.1"     % Test
 libraryDependencies += "io.circe"               %% "circe-core"                    % circeVersion % Test
 libraryDependencies += "io.circe"               %% "circe-literal"                 % circeVersion % Test
@@ -43,7 +43,7 @@ libraryDependencies += "org.scalacheck"         %% "scalacheck"
 libraryDependencies += "org.scalatest"          %% "scalatest"                     % "3.2.18"     % Test
 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.17.0"     % Test
+libraryDependencies += "org.seleniumhq.selenium" % "selenium-java"                 % "4.18.1"     % Test
 libraryDependencies += "org.slf4j"               % "slf4j-log4j12"                 % "2.0.11"     % Test
 libraryDependencies += "org.typelevel"          %% "cats-effect"                   % "3.5.3"      % Test
 libraryDependencies += "org.typelevel"          %% "cats-effect-testing-scalatest" % "1.5.0"      % Test

diff --git a/acceptance-tests/project/build.properties b/acceptance-tests/project/build.properties
@@ -1 +1 @@
-sbt.version=1.9.8
+sbt.version=1.9.9
diff --git a/cypress-tests/config.ts b/cypress-tests/config.ts
@@ -5,4 +5,5 @@ export const TIMEOUTS = {
   standard: 20_000,
   long: 60_000,
   vlong: 180_000,
+  vvlong: 300_000,
 };
diff --git a/cypress-tests/cypress/e2e/checkWorkflows.cy.ts b/cypress-tests/cypress/e2e/checkWorkflows.cy.ts
@@ -103,7 +103,8 @@ describe("Workflows pages", () => {
       .contains("span", "m")
       .should("be.visible");
     cy.getDataCy("workflow-details")
-      .get("a#icon-link-5")
+      .contains("tr", "Default value")
+      .find("a")
       .should("be.visible")
       .click();
     cy.get("#file-card-header")

diff --git a/cypress-tests/cypress/e2e/rstudioSession.cy.ts b/cypress-tests/cypress/e2e/rstudioSession.cy.ts
@@ -63,6 +63,7 @@ describe("Basic rstudio functionality", () => {
     { defaultCommandTimeout: TIMEOUTS.long },
     () => {
       // Waits for the image to build and launches a session
+      // Note: rstudio image may take a while to build
       cy.startSession(projectIdentifier);
 
       // Opens the session in an iframe