From 565ccdd6a4f4a0d578450393d15df67874448c71 Mon Sep 17 00:00:00 2001
From: Jiri Novotny <jnovotny@redhat.com>
Date: Mon, 6 Jun 2022 16:36:16 +0200
Subject: [PATCH] DBZ-5212 Add set -e to bash scripts used in our jobs

---
 jenkins-jobs/scripts/build-connect-image.sh              | 1 +
 jenkins-jobs/scripts/build-rhel-kafka-image.sh           | 1 +
 jenkins-jobs/scripts/copy-images.sh                      | 2 +-
 jenkins-jobs/scripts/copy-plugins.sh                     | 2 +-
 jenkins-jobs/scripts/upstream-artifact-server-prepare.sh | 2 +-
 jenkins-jobs/scripts/upstream-kafka-connect-prepare.sh   | 3 +--
 6 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/jenkins-jobs/scripts/build-connect-image.sh b/jenkins-jobs/scripts/build-connect-image.sh
index 4a19fa985..470725893 100755
--- a/jenkins-jobs/scripts/build-connect-image.sh
+++ b/jenkins-jobs/scripts/build-connect-image.sh
@@ -1,4 +1,5 @@
 #! /usr/bin/env bash
+set -e
 DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null 2>&1 && pwd )"
 COPY_IMAGES=true
 REGISTRY="quay.io"
diff --git a/jenkins-jobs/scripts/build-rhel-kafka-image.sh b/jenkins-jobs/scripts/build-rhel-kafka-image.sh
index 497ab62ea..341c71e94 100755
--- a/jenkins-jobs/scripts/build-rhel-kafka-image.sh
+++ b/jenkins-jobs/scripts/build-rhel-kafka-image.sh
@@ -1,4 +1,5 @@
 #! /usr/bin/env bash
+set -e
 DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null 2>&1 && pwd )"
 DOCKER_FILE=${DIR}/../docker/rhel_kafka/Dockerfile
 PLUGIN_DIR="plugins"
diff --git a/jenkins-jobs/scripts/copy-images.sh b/jenkins-jobs/scripts/copy-images.sh
index defb636f3..db8caff7a 100755
--- a/jenkins-jobs/scripts/copy-images.sh
+++ b/jenkins-jobs/scripts/copy-images.sh
@@ -1,5 +1,5 @@
 #! /usr/bin/env bash
-
+set -e
 DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null 2>&1 && pwd )"
 COPY_IMAGES=true
 REGISTRY="quay.io"
diff --git a/jenkins-jobs/scripts/copy-plugins.sh b/jenkins-jobs/scripts/copy-plugins.sh
index 522a82591..ddd7ba94d 100755
--- a/jenkins-jobs/scripts/copy-plugins.sh
+++ b/jenkins-jobs/scripts/copy-plugins.sh
@@ -1,5 +1,5 @@
 #! /usr/bin/env bash
-set -x
+set -e
 DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null 2>&1 && pwd )"
 DOCKER_FILE=${DIR}/../docker/artifact-server/Dockerfile
 PLUGIN_DIR="plugins"
diff --git a/jenkins-jobs/scripts/upstream-artifact-server-prepare.sh b/jenkins-jobs/scripts/upstream-artifact-server-prepare.sh
index 028ba3779..103c3feee 100755
--- a/jenkins-jobs/scripts/upstream-artifact-server-prepare.sh
+++ b/jenkins-jobs/scripts/upstream-artifact-server-prepare.sh
@@ -1,5 +1,5 @@
 #! /usr/bin/env bash
-set -x
+set -e
 DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null 2>&1 && pwd )"
 DOCKER_FILE=${DIR}/../docker/artifact-server/Dockerfile
 PLUGIN_DIR="plugins"
diff --git a/jenkins-jobs/scripts/upstream-kafka-connect-prepare.sh b/jenkins-jobs/scripts/upstream-kafka-connect-prepare.sh
index 508c93f96..7f694045b 100755
--- a/jenkins-jobs/scripts/upstream-kafka-connect-prepare.sh
+++ b/jenkins-jobs/scripts/upstream-kafka-connect-prepare.sh
@@ -1,10 +1,9 @@
 #! /usr/bin/env bash
-set -x
+set -e
 DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null 2>&1 && pwd )"
 DOCKER_FILE=${DIR}/../docker/Dockerfile.Strimzi
 PLUGIN_DIR="plugins"
 
-
 OPTS=$(getopt -o d:f:r:o:t:a: --long dir:,dockerfile:,registry:,organisation:,tags:,auto-tag:,kc-base-tag:,kafka-version:,apicurio-version:,dest-login:,dest-pass:,img-output:,oracle-included:,maven-repo: -n 'parse-options' -- "$@")
 if [ $? != 0 ] ; then echo "Failed parsing options." >&2 ; exit 1 ; fi
 eval set -- "$OPTS"