From 0643fa03be2492f8b9ff0e791f72f2f4fad0bc19 Mon Sep 17 00:00:00 2001 From: Toby Bellwood Date: Wed, 3 Jul 2024 11:15:29 +1000 Subject: [PATCH] chore: point makefile and jenkinsfile to lagoon-220 branch --- Jenkinsfile | 2 +- Makefile | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index 0130585f0d..4eabe54b9a 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -226,7 +226,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-220 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 4b1ed23648..ad86adb746 100644 --- a/Makefile +++ b/Makefile @@ -394,7 +394,7 @@ STERN_VERSION = v2.6.1 CHART_TESTING_VERSION = v3.11.0 K3D_IMAGE = docker.io/rancher/k3s:v1.30.1-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 = sshkey-handler +CHARTS_TREEISH = lagoon-220 TASK_IMAGES = task-activestandby # the name of the docker network to create