chore: use main branch of phd-cluster-template

.github/workflows/build-all.yml

@@ -37,7 +37,7 @@ on:
 jobs:
   build:
     name: Build ${{ matrix.service }} service
-    uses: open-craft/phd-cluster-template/.github/workflows/build.yml@gabor/experiment
+    uses: open-craft/phd-cluster-template/.github/workflows/build.yml@main
     strategy:
       matrix:
         service: ["openedx", "mfe"]
@@ -55,7 +55,7 @@ jobs:
 
   update-env-dir:
     name: Update env directory
-    uses: open-craft/phd-cluster-template/.github/workflows/generate-env-dir.yml@gabor/experiment
+    uses: open-craft/phd-cluster-template/.github/workflows/generate-env-dir.yml@main
     needs:
       - build
     secrets:

.github/workflows/build.yml

@@ -79,7 +79,7 @@ jobs:
   update-env-dir:
     if: ${{ inputs.UPDATE_ENV_DIR }}
     name: Update env directory
-    uses: open-craft/phd-cluster-template/.github/workflows/generate-env-dir.yml@gabor/experiment
+    uses: open-craft/phd-cluster-template/.github/workflows/generate-env-dir.yml@main
     needs:
       - build
     secrets:

.github/workflows/generate-env-dir.yml

@@ -78,7 +78,7 @@ jobs:
 
       - name: Enable and install picasso plugin in Tutor environment
         run: |
-          pip install git+https://github.com/eduNEXT/tutor-contrib-picasso@v0.2.0
+          pip install git+https://github.com/open-craft/tutor-contrib-picasso@kaustav/fix_tutor_main_compatibility
           tutor plugins enable picasso
 
       - name: Update config and generate env directory

cluster-template/cookiecutter.json

@@ -13,7 +13,7 @@
   "harmony_module_version": "deaf58ed6dc8d2d60ba5fed42d0ad472944dfaf7",
   "opencraft_module_version": "d55c99f57ee6cdadbfe3b01e19e456fb38b29e21",
   "picasso_version": "kaustav/new_ghcr_test",
-  "phd_cluster_template_version": "gabor/experiment",
+  "phd_cluster_template_version": "main",
   "tutor_version": "v20.0.5",
   "github_organization": "open-craft",
   "github_repository": "git@github.com:{{ cookiecutter.github_organization }}/phd-{{ cookiecutter.cluster_slug_normalized }}-cluster.git",

cluster-template/phd-{{cookiecutter.cluster_slug_normalized}}-cluster/.github/workflows/build-all.yml

@@ -28,7 +28,7 @@ on:
 jobs:
   build-all:
     name: Build all services
-    uses: open-craft/phd-cluster-template/.github/workflows/build-all.yml@gabor/experiment
+    uses: open-craft/phd-cluster-template/.github/workflows/build-all.yml@main
     secrets:
       SSH_PRIVATE_KEY: {% raw %}${{ secrets.SSH_PRIVATE_KEY }}{% endraw %}
     with:

cluster-template/phd-{{cookiecutter.cluster_slug_normalized}}-cluster/.github/workflows/build.yml

@@ -35,7 +35,7 @@ on:
 jobs:
   build:
     name: Build '{% raw %}${{ inputs.SERVICE }}{% endraw %}' image
-    uses: open-craft/phd-cluster-template/.github/workflows/build.yml@kaustav/new_ghcr_test
+    uses: open-craft/phd-cluster-template/.github/workflows/build.yml@main
     secrets:
       SSH_PRIVATE_KEY: {% raw %}${{ secrets.SSH_PRIVATE_KEY }}{% endraw %}
     with:

instance-template/{{cookiecutter.instance_slug}}/application.yml

@@ -28,7 +28,7 @@ spec:
       - ApplyOutOfSyncOnly=true
       - RespectIgnoreDifferences=true
     retry:
-      limit: 5
+      limit: 2
       backoff:
         duration: 5s
         factor: 2