Merge remote-tracking branch 'origin/master' into nightly

CHANGELOG.md

@@ -18,6 +18,11 @@ Every user-facing change should have an entry in this changelog. Please respect
 
 ## Unreleased
 
+## v14.0.1 (2022-06-13)
+
+- [Bugfix] Fix missing tables on migration from maple ([#689](https://github.com/overhangio/tutor/issues/689)). (by @ibrmora)
+- [Bugfix] Fix plugin patches in cms.env.yml template.
+
 ## v14.0.0 (2022-06-09)
 
 - 💥[Feature] Upgrade to Nutmeg: (by @regisb)

tutor/__about__.py

@@ -2,7 +2,7 @@ import os
 
 # Increment this version number to trigger a new release. See
 # docs/tutor.html#versioning for information on the versioning scheme.
-__version__ = "14.0.0"
+__version__ = "14.0.1"
 
 # The version suffix will be appended to the actual version, separated by a
 # dash. Use this suffix to differentiate between the actual released version and

tutor/commands/upgrade/k8s.py

@@ -129,6 +129,11 @@ def upgrade_from_maple(context: Context, config: Config) -> None:
         "app.kubernetes.io/name=lms",
     )
     k8s.wait_for_pod_ready(config, "lms")
+
+    # Command backpopulate_user_tours
+    k8s.kubectl_exec(
+        config, "lms", ["sh", "-e", "-c", "./manage.py lms migrate user_tours"]
+    )
     k8s.kubectl_exec(
         config, "lms", ["sh", "-e", "-c", "./manage.py lms backpopulate_user_tours"]
     )
@@ -140,9 +145,24 @@ def upgrade_from_maple(context: Context, config: Config) -> None:
         "app.kubernetes.io/name=cms",
     )
     k8s.wait_for_pod_ready(config, "cms")
+
+    # Command backfill_course_tabs
+    k8s.kubectl_exec(
+        config, "cms", ["sh", "-e", "-c", "./manage.py cms migrate contentstore"]
+    )
+    k8s.kubectl_exec(
+        config,
+        "cms",
+        ["sh", "-e", "-c", "./manage.py cms migrate split_modulestore_django"],
+    )
     k8s.kubectl_exec(
         config, "cms", ["sh", "-e", "-c", "./manage.py cms backfill_course_tabs"]
     )
+
+    # Command simulate_publish
+    k8s.kubectl_exec(
+        config, "cms", ["sh", "-e", "-c", "./manage.py cms migrate course_overviews"]
+    )
     k8s.kubectl_exec(
         config, "cms", ["sh", "-e", "-c", "./manage.py cms simulate_publish"]
     )

tutor/commands/upgrade/local.py

@@ -103,14 +103,39 @@ def upgrade_from_maple(context: click.Context, config: Config) -> None:
     click.echo(fmt.title("Upgrading from Maple"))
     # The environment needs to be updated because the management commands are from Nutmeg
     tutor_env.save(context.obj.root, config)
+    # Command backpopulate_user_tours
+    context.invoke(
+        compose.run,
+        args=["lms", "sh", "-e", "-c", "./manage.py lms migrate user_tours"],
+    )
     context.invoke(
         compose.run,
         args=["lms", "sh", "-e", "-c", "./manage.py lms backpopulate_user_tours"],
     )
+    # Command backfill_course_tabs
+    context.invoke(
+        compose.run,
+        args=["cms", "sh", "-e", "-c", "./manage.py cms migrate contentstore"],
+    )
+    context.invoke(
+        compose.run,
+        args=[
+            "cms",
+            "sh",
+            "-e",
+            "-c",
+            "./manage.py cms migrate split_modulestore_django",
+        ],
+    )
     context.invoke(
         compose.run,
         args=["cms", "sh", "-e", "-c", "./manage.py cms backfill_course_tabs"],
     )
+    # Command simulate_publish
+    context.invoke(
+        compose.run,
+        args=["cms", "sh", "-e", "-c", "./manage.py cms migrate course_overviews"],
+    )
     context.invoke(
         compose.run,
         args=["cms", "sh", "-e", "-c", "./manage.py cms simulate_publish"],