From 51784750d9edad53df33d54259efcfce3f4706cc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Manuel=20de=20la=20Pe=C3=B1a?= <manuel.delapena@elastic.co>
Date: Wed, 29 Jul 2020 17:46:32 +0200
Subject: [PATCH 1/2] feat(ci): support building docker images for PRs

---
 .ci/packaging.groovy | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/.ci/packaging.groovy b/.ci/packaging.groovy
index 1f18c65e9e79..4a3d46889e3a 100644
--- a/.ci/packaging.groovy
+++ b/.ci/packaging.groovy
@@ -188,9 +188,15 @@ def tagAndPush(name){
   if("${env.SNAPSHOT}" == "true"){
     libbetaVer += "-SNAPSHOT"
   }
+
+  def imageName = "${name}"
+  if (env.CHANGE_ID?.trim()) {
+    imageName = "${name}/pr-${env.CHANGE_ID}"
+  }
+
   def oldName = "${DOCKER_REGISTRY}/beats/${name}:${libbetaVer}"
-  def newName = "${DOCKER_REGISTRY}/observability-ci/${name}:${libbetaVer}"
-  def commitName = "${DOCKER_REGISTRY}/observability-ci/${name}:${env.GIT_BASE_COMMIT}"
+  def newName = "${DOCKER_REGISTRY}/observability-ci/${imageName}:${libbetaVer}"
+  def commitName = "${DOCKER_REGISTRY}/observability-ci/${imageName}:${env.GIT_BASE_COMMIT}"
   dockerLogin(secret: "${DOCKERELASTIC_SECRET}", registry: "${DOCKER_REGISTRY}")
   retry(3){
     sh(label:'Change tag and push', script: """

From ccf25aa53947ef80e528619c1d7f2bc708229568 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Manuel=20de=20la=20Pe=C3=B1a?= <manuel.delapena@elastic.co>
Date: Wed, 29 Jul 2020 18:42:30 +0200
Subject: [PATCH 2/2] chore: use PR_ID as tag

---
 .ci/packaging.groovy | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/.ci/packaging.groovy b/.ci/packaging.groovy
index 4a3d46889e3a..77d8c05561f0 100644
--- a/.ci/packaging.groovy
+++ b/.ci/packaging.groovy
@@ -189,14 +189,14 @@ def tagAndPush(name){
     libbetaVer += "-SNAPSHOT"
   }
 
-  def imageName = "${name}"
+  def tagName = "${libbetaVer}"
   if (env.CHANGE_ID?.trim()) {
-    imageName = "${name}/pr-${env.CHANGE_ID}"
+    tagName = "pr-${env.CHANGE_ID}"
   }
 
   def oldName = "${DOCKER_REGISTRY}/beats/${name}:${libbetaVer}"
-  def newName = "${DOCKER_REGISTRY}/observability-ci/${imageName}:${libbetaVer}"
-  def commitName = "${DOCKER_REGISTRY}/observability-ci/${imageName}:${env.GIT_BASE_COMMIT}"
+  def newName = "${DOCKER_REGISTRY}/observability-ci/${name}:${tagName}"
+  def commitName = "${DOCKER_REGISTRY}/observability-ci/${name}:${env.GIT_BASE_COMMIT}"
   dockerLogin(secret: "${DOCKERELASTIC_SECRET}", registry: "${DOCKER_REGISTRY}")
   retry(3){
     sh(label:'Change tag and push', script: """