From 75c17b0e344440dc72f203a8aaab4db763f22e24 Mon Sep 17 00:00:00 2001 From: Alexandre Chapellon Date: Wed, 10 Jul 2024 09:59:04 +0200 Subject: [PATCH] deal with community bump from acs-comunity-packaging --- scripts/updatecli/updatecli_base.yml | 2 ++ scripts/updatecli/updatecli_community.yml | 1 + scripts/updatecli/updatecli_config.tpl | 16 ++++++++++++---- 3 files changed, 15 insertions(+), 4 deletions(-) diff --git a/scripts/updatecli/updatecli_base.yml b/scripts/updatecli/updatecli_base.yml index ddd43528f..c07c02eae 100644 --- a/scripts/updatecli/updatecli_base.yml +++ b/scripts/updatecli/updatecli_base.yml @@ -1,6 +1,8 @@ # Common updatecli values for different acs versions # meant to be used with at least another updatecli_acsxx.yml value file +acs: + edition: enterprise targets: main: true amps: diff --git a/scripts/updatecli/updatecli_community.yml b/scripts/updatecli/updatecli_community.yml index 1510d6b71..1110db3b6 100644 --- a/scripts/updatecli/updatecli_community.yml +++ b/scripts/updatecli/updatecli_community.yml @@ -1,5 +1,6 @@ acs: version: "23.2" + edition: community acc: version: "8.4" diff --git a/scripts/updatecli/updatecli_config.tpl b/scripts/updatecli/updatecli_config.tpl index e3f4097c2..6730424a9 100644 --- a/scripts/updatecli/updatecli_config.tpl +++ b/scripts/updatecli/updatecli_config.tpl @@ -1,7 +1,7 @@ name: ACS update pipeline scms: - acsRepo: + acsEntRepo: kind: github spec: owner: Alfresco @@ -9,7 +9,15 @@ scms: branch: master token: {{ requiredEnv "UPDATECLI_GITHUB_TOKEN" }} username: {{ requiredEnv "UPDATECLI_GITHUB_USERNAME" }} - acsEntRepo: + acsComRepo: + kind: github + spec: + owner: Alfresco + repository: acs-community-packaging + branch: master + token: {{ requiredEnv "UPDATECLI_GITHUB_TOKEN" }} + username: {{ requiredEnv "UPDATECLI_GITHUB_USERNAME" }} + agsAmpRepo: kind: github spec: owner: Alfresco @@ -103,7 +111,7 @@ sources: acs: name: ACS {{ .acs.version }}.x kind: gittag - scmid: acsRepo + scmid: {{ eq .acs.edition "enterprise" | ternary "acsEntRepo" "acsComRepo" }} spec: versionFilter: kind: regex @@ -132,7 +140,7 @@ sources: agsAmp: name: AGS AMP {{ .ags.version }}.x kind: gittag - scmid: acsEntRepo + scmid: agsAmpRepo spec: versionFilter: kind: regex