From a5e9183ac5c767e4609cd267b292e65818072ce2 Mon Sep 17 00:00:00 2001
From: Mangirdas Judeikis <Mangirdas@Judeikis.LT>
Date: Fri, 17 Sep 2021 12:36:35 +0100
Subject: [PATCH] fluentbit pipeline

---
 .pipelines/build-and-push-fluentbit.yml       | 22 +++++++++++++++++++
 .pipelines/build-and-push-images.yml          |  1 +
 .pipelines/e2e.yml                            |  1 +
 .../templates/template-push-images-to-acr.yml |  3 ++-
 4 files changed, 26 insertions(+), 1 deletion(-)
 create mode 100644 .pipelines/build-and-push-fluentbit.yml

diff --git a/.pipelines/build-and-push-fluentbit.yml b/.pipelines/build-and-push-fluentbit.yml
new file mode 100644
index 000000000..8a865210b
--- /dev/null
+++ b/.pipelines/build-and-push-fluentbit.yml
@@ -0,0 +1,22 @@
+# Azure DevOps Pipeline building rp images and pushing to int acr
+trigger: none
+pr: none
+
+variables:
+- template: vars.yml
+
+jobs:
+- job: Build_and_push_image_fluentbit
+  pool:
+    name: ARO-CI
+
+  steps:
+  - template: ./templates/template-checkout.yml
+  - template: ./templates/template-az-cli-login.yml
+    parameters:
+      azureDevOpsJSONSPN: $(aro-v4-ci-devops-spn)
+  - template: ./templates/template-push-images-to-acr.yml
+    parameters:
+      rpImageACR: $(RP_IMAGE_ACR)
+      buildCommand: "publish-image-fluentbit"
+  - template: ./templates/template-az-cli-logout.yml
diff --git a/.pipelines/build-and-push-images.yml b/.pipelines/build-and-push-images.yml
index 7e76dc119..73ba1de6d 100644
--- a/.pipelines/build-and-push-images.yml
+++ b/.pipelines/build-and-push-images.yml
@@ -18,6 +18,7 @@ jobs:
   - template: ./templates/template-push-images-to-acr.yml
     parameters:
       rpImageACR: $(RP_IMAGE_ACR)
+      buildCommand: "publish-image-aro"
   - template: ./templates/template-az-cli-logout.yml
   - script: |
       cp -a --parents aro "$(Build.ArtifactStagingDirectory)"
diff --git a/.pipelines/e2e.yml b/.pipelines/e2e.yml
index 9c871db0b..37b313eba 100644
--- a/.pipelines/e2e.yml
+++ b/.pipelines/e2e.yml
@@ -30,6 +30,7 @@ jobs:
   - template: ./templates/template-push-images-to-acr.yml
     parameters:
       rpImageACR: $(RP_IMAGE_ACR)
+      buildCommand: "publish-image-aro"
   - script: |
       set -e
       set -o pipefail
diff --git a/.pipelines/templates/template-push-images-to-acr.yml b/.pipelines/templates/template-push-images-to-acr.yml
index acd3fe260..11c27ef70 100644
--- a/.pipelines/templates/template-push-images-to-acr.yml
+++ b/.pipelines/templates/template-push-images-to-acr.yml
@@ -1,5 +1,6 @@
 parameters:
   rpImageACR: ''
+  buildCommand: ''
 steps:
 - script: |
     set -e
@@ -10,5 +11,5 @@ steps:
     az acr login --name "$RP_IMAGE_ACR"
     # azure checkouts commit, so removing master reference when publishing image
     export BRANCH=$(Build.SourceBranchName)
-    make publish-image-aro
+    make ${{ parameters.buildCommand }}
   displayName: ⚙️ Build and push images to ACR