From aa3181449899eb9523fb5133f40121eb7ad7dba1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Manuel=20de=20la=20Pe=C3=B1a?= Date: Tue, 24 Aug 2021 17:54:23 +0200 Subject: [PATCH 1/2] fix(ci): include complete as supported variant on merges --- Jenkinsfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Jenkinsfile b/Jenkinsfile index 47fb6f603e81..7f5c091c5700 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -455,7 +455,7 @@ def tagAndPush(Map args = [:]) { tags << aliasVersion } // supported image flavours - def variants = ["", "-oss", "-ubi8"] + def variants = ["", "-complete", "-oss", "-ubi8"] variants.each { variant -> tags.each { tag -> doTagAndPush(beatName: beatName, variant: variant, sourceTag: libbetaVer, targetTag: "${tag}-${arch}") From 1352715d13ce343428616d727f593a77858646e3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Manuel=20de=20la=20Pe=C3=B1a?= Date: Wed, 25 Aug 2021 08:48:33 +0200 Subject: [PATCH 2/2] chore: simplify --- Jenkinsfile | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/Jenkinsfile b/Jenkinsfile index 7f5c091c5700..3d552c4a4d04 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -455,7 +455,13 @@ def tagAndPush(Map args = [:]) { tags << aliasVersion } // supported image flavours - def variants = ["", "-complete", "-oss", "-ubi8"] + def variants = ["", "-oss", "-ubi8"] + + // only add complete variant for the elastic-agent + if(beatName == 'elastic-agent'){ + variants.add("-complete") + } + variants.each { variant -> tags.each { tag -> doTagAndPush(beatName: beatName, variant: variant, sourceTag: libbetaVer, targetTag: "${tag}-${arch}")