From 76bbb9362413a92072fed907868d489082c52ca5 Mon Sep 17 00:00:00 2001
From: Ida Novindasari <idanovinda@gmail.com>
Date: Tue, 12 Sep 2023 12:31:00 +0200
Subject: [PATCH] Enable build and push of dev-16 branch (#919)

* Enable build and push of dev-16 branch

* comment tag-spilo

* add condition to diff pg version

* simplify if else

* remove if else
---
 delivery.yaml | 32 +++++++++++++++++---------------
 1 file changed, 17 insertions(+), 15 deletions(-)

diff --git a/delivery.yaml b/delivery.yaml
index ad86a843f..1416076cb 100644
--- a/delivery.yaml
+++ b/delivery.yaml
@@ -5,13 +5,15 @@ pipeline:
 - id: push-spilo-ecr
   env:
     BASE_IMAGE: container-registry.zalando.net/library/ubuntu-22.04
-    PGVERSION: 15
+    PGVERSION: 16
     MULTI_ARCH_REGISTRY: container-registry-test.zalando.net/acid
   type: script
   requires_human_approval: true
   when:
     - event: push
       branch: master
+    - event: push
+      branch: dev-16
   timeout: 10h
   vm_config:
     type: linux
@@ -34,18 +36,18 @@ pipeline:
                           --push .
       cdp-promote-image "$ECR_TEST_IMAGE"
 
-- id: tag-spilo
-  depends_on: [push-spilo-ecr]
-  type: script
-  requires_human_approval: true
-  when:
-    event: push
-    branch: master
-  commands:
-  - desc: Tag release spilo image
-    cmd: |
-      PATRONIVERSION=$(sed -n 's/^ENV PATRONIVERSION=\([1-9][0-9]*\.[0-9]*\).*$/\1/p' postgres-appliance/Dockerfile)
-      COUNTER=$(git tag | sed -n "s/^$PATRONIVERSION-p//p" | sort -un | tail -n1)
-      TAG="$PATRONIVERSION-p$((COUNTER+1))"
+# - id: tag-spilo
+#   depends_on: [push-spilo-ecr]
+#   type: script
+#   requires_human_approval: true
+#   when:
+#     event: push
+#     branch: master
+#   commands:
+#   - desc: Tag release spilo image
+#     cmd: |
+#       PATRONIVERSION=$(sed -n 's/^ENV PATRONIVERSION=\([1-9][0-9]*\.[0-9]*\).*$/\1/p' postgres-appliance/Dockerfile)
+#       COUNTER=$(git tag | sed -n "s/^$PATRONIVERSION-p//p" | sort -un | tail -n1)
+#       TAG="$PATRONIVERSION-p$((COUNTER+1))"
 
-      git gh-tag "$TAG"
+#       git gh-tag "$TAG"