From 660fd980a6ec5bab8150aa12e83b8827b6ddfd6f Mon Sep 17 00:00:00 2001
From: Toby Bellwood <toby.bellwood@amazee.io>
Date: Fri, 18 Oct 2024 12:25:24 +1100
Subject: [PATCH 1/2] chore: use lagoon v222 branches for build/test

---
 Jenkinsfile | 2 +-
 Makefile    | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/Jenkinsfile b/Jenkinsfile
index dce95f47df..3982fc0d39 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -230,7 +230,7 @@ pipeline {
         TOKEN = credentials('git-amazeeio-helmfile-ci-trigger')
       }
       steps {
-        sh script: "curl -X POST -F token=$TOKEN -F ref=main https://git.amazeeio.cloud/api/v4/projects/86/trigger/pipeline", label: "Trigger lagoon-core helmfile sync on amazeeio-test6"
+        sh script: "curl -X POST -F token=$TOKEN -F ref=lagoon_v222 https://git.amazeeio.cloud/api/v4/projects/86/trigger/pipeline", label: "Trigger lagoon-core helmfile sync on amazeeio-test6"
       }
     }
     stage ('push images to uselagoon/*') {
diff --git a/Makefile b/Makefile
index 92849952d3..d1e2d3f9f2 100644
--- a/Makefile
+++ b/Makefile
@@ -400,7 +400,7 @@ STERN_VERSION = v2.6.1
 CHART_TESTING_VERSION = v3.11.0
 K3D_IMAGE = docker.io/rancher/k3s:v1.31.0-k3s1
 TESTS = [nginx,api,features-kubernetes,bulk-deployment,features-kubernetes-2,features-variables,active-standby-kubernetes,tasks,drush,python,gitlab,github,bitbucket,services,workflows]
-CHARTS_TREEISH = main
+CHARTS_TREEISH = lagoon_v222
 TASK_IMAGES = task-activestandby
 
 # the name of the docker network to create

From 3fb436bb0d2d177e80f75d1c4ce31ff1adf1649e Mon Sep 17 00:00:00 2001
From: Toby Bellwood <toby.bellwood@amazee.io>
Date: Mon, 21 Oct 2024 09:07:53 +1100
Subject: [PATCH 2/2] tests: add pause to bulk-deployment test

---
 tests/tests/bulk-deployment/bulk-deployment.yaml | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/tests/tests/bulk-deployment/bulk-deployment.yaml b/tests/tests/bulk-deployment/bulk-deployment.yaml
index d95b2f1daa..f12cf24d3f 100644
--- a/tests/tests/bulk-deployment/bulk-deployment.yaml
+++ b/tests/tests/bulk-deployment/bulk-deployment.yaml
@@ -131,6 +131,14 @@
   tasks:
   - ansible.builtin.include_tasks: ../../tasks/api/add-environment.yaml
 
+- name: "{{ testname }} - wait for 30 seconds to give all projects time to create"
+  hosts: localhost
+  serial: 1
+  vars:
+    seconds: "30"
+  tasks:
+  - ansible.builtin.include_tasks: ../../tasks/pause.yaml
+
 - name: "{{ testname }} - Trigger bulk deployment"
   hosts: localhost
   serial: 1