From 738afa76fa5e80a49aae148db80b10b63814bbc3 Mon Sep 17 00:00:00 2001
From: Geofrey Flores <gflores@jahia.com>
Date: Tue, 1 Aug 2023 10:12:21 -0400
Subject: [PATCH] BACKLOG-20402: Increase integration test timeouts on github
 workflows

---
 .github/workflows/nightly.yml  | 2 +-
 .github/workflows/on-merge.yml | 2 +-
 tests/assets/provisioning.yml  | 6 ++++--
 3 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/nightly.yml b/.github/workflows/nightly.yml
index a677bb7ba..6243bd9de 100644
--- a/.github/workflows/nightly.yml
+++ b/.github/workflows/nightly.yml
@@ -12,7 +12,7 @@ jobs:
       fail-fast: false
       matrix:
         jahia_image: ["jahia/jahia-ee:8", "jahia/jahia-ee-dev:8-SNAPSHOT"]
-    timeout-minutes: 45
+    timeout-minutes: 120
     steps:
       - uses: jahia/jahia-modules-action/helper@v2
       - uses: KengoTODA/actions-setup-docker-compose@main
diff --git a/.github/workflows/on-merge.yml b/.github/workflows/on-merge.yml
index f626bb47d..a74d86c54 100644
--- a/.github/workflows/on-merge.yml
+++ b/.github/workflows/on-merge.yml
@@ -57,7 +57,7 @@ jobs:
     name: Integration Tests (Standalone)
     needs: build
     runs-on: self-hosted
-    timeout-minutes: 60
+    timeout-minutes: 120
     steps:
       - uses: jahia/jahia-modules-action/helper@v2
       - uses: KengoTODA/actions-setup-docker-compose@main
diff --git a/tests/assets/provisioning.yml b/tests/assets/provisioning.yml
index be271c927..dc230f132 100644
--- a/tests/assets/provisioning.yml
+++ b/tests/assets/provisioning.yml
@@ -1,8 +1,6 @@
 - addMavenRepository: 'https://store.jahia.com/nexus/content/repositories/jahia-public-app-store@id=JahiaStore'
 - addMavenRepository: 'https://devtools.jahia.com/nexus/content/groups/public/@snapshots@noreleases@id=JahiaPublicSnapshots'
 
-- uninstallBundle: "org.jahia.modules/content-editor/4.6.0.SNAPSHOT"
-
 - installBundle:
     - 'mvn:org.jahia.modules/press/3.1.0'
     - 'mvn:org.jahia.modules/article/3.0.0'
@@ -37,3 +35,7 @@
   site: "digitall"
 
 - executeScript: "script-01-create-categories.groovy"
+
+- uninstallBundle: 
+    - "org.jahia.modules/content-editor/4.6.0.SNAPSHOT"
+    - "org.jahia.modules/jcontent/2.12.0.SNAPSHOT"