From a8db336c1a03d01e8aacd4f811bebc5ab9542b26 Mon Sep 17 00:00:00 2001
From: Staffan Olsson <staffan@repos.se>
Date: Thu, 3 Aug 2017 14:24:05 +0200
Subject: Rack awareness is candidate for merge

---
 prod-yolean.sh | 50 --------------------------------------------------
 qa-yolean.sh   | 51 +++++++++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 51 insertions(+), 50 deletions(-)
 delete mode 100755 prod-yolean.sh
 create mode 100755 qa-yolean.sh

diff --git a/prod-yolean.sh b/prod-yolean.sh
deleted file mode 100755
index 2f9b775..0000000
--- a/prod-yolean.sh
+++ /dev/null
@@ -1,50 +0,0 @@
-#!/bin/bash
-# Combines addons into what we 'kubectl apply -f' to production
-set -ex
-
-ANNOTATION_PREFIX='yolean.se/kubernetes-kafka-'
-BUILD=$(basename $0)
-REMOTE=origin
-FROM="$REMOTE/"
-START=master
-
-[ ! -z "$(git status --untracked-files=no -s)" ] && echo "Working copy must be clean" && exit 1
-
-function annotate {
-  key=$1
-  value=$2
-  file=$3
-  case $(uname) in
-    Darwin*)
-      sed -i '' 's|      annotations:|      annotations:\
-        --next-annotation--|' $file
-      sed -i '' "s|--next-annotation--|${ANNOTATION_PREFIX}$key: '$value'|" $file
-      ;;
-    *)
-      sed -i "s|      annotations:|      annotations:\n        ${ANNOTATION_PREFIX}$key: '$value'|" $file
-      ;;
-  esac
-}
-
-git checkout ${FROM}$START
-REVS="$START:$(git rev-parse --short ${FROM}$START)"
-
-git checkout -b prod-yolean-$(date +"%Y%m%dT%H%M%S")
-
-for BRANCH in \
-  addon-storage-classes \
-  rolling-update \
-  addon-metrics \
-  addon-kube-events-topic
-do
-  git merge --no-ff ${FROM}$BRANCH -m "prod-yolean merge ${FROM}$BRANCH" && \
-    REVS="$REVS $BRANCH:$(git rev-parse --short ${FROM}$BRANCH)"
-done
-
-END_BRANCH_GIT=$(git rev-parse --abbrev-ref HEAD)
-
-for F in ./50kafka.yml ./zookeeper/50pzoo.yml ./zookeeper/51zoo.yml
-do
-  annotate revs "$REVS" $F
-  annotate build "$END_BRANCH_GIT" $F
-done
diff --git a/qa-yolean.sh b/qa-yolean.sh
new file mode 100755
index 0000000..8940128
--- /dev/null
+++ b/qa-yolean.sh
@@ -0,0 +1,51 @@
+#!/bin/bash
+# Combines addons into what we 'kubectl apply -f' to production
+set -ex
+
+ANNOTATION_PREFIX='yolean.se/kubernetes-kafka-'
+BUILD=$(basename $0)
+REMOTE=origin
+FROM="$REMOTE/"
+START=master
+
+[ ! -z "$(git status --untracked-files=no -s)" ] && echo "Working copy must be clean" && exit 1
+
+function annotate {
+  key=$1
+  value=$2
+  file=$3
+  case $(uname) in
+    Darwin*)
+      sed -i '' 's|      annotations:|      annotations:\
+        --next-annotation--|' $file
+      sed -i '' "s|--next-annotation--|${ANNOTATION_PREFIX}$key: '$value'|" $file
+      ;;
+    *)
+      sed -i "s|      annotations:|      annotations:\n        ${ANNOTATION_PREFIX}$key: '$value'|" $file
+      ;;
+  esac
+}
+
+git checkout ${FROM}$START
+REVS="$START:$(git rev-parse --short ${FROM}$START)"
+
+git checkout -b qa-yolean-$(date +"%Y%m%dT%H%M%S")
+
+for BRANCH in \
+  multizone-rack-awareness \
+  addon-storage-classes \
+  rolling-update \
+  addon-metrics \
+  addon-kube-events-topic
+do
+  git merge --no-ff ${FROM}$BRANCH -m "qa-yolean merge ${FROM}$BRANCH" && \
+    REVS="$REVS $BRANCH:$(git rev-parse --short ${FROM}$BRANCH)"
+done
+
+END_BRANCH_GIT=$(git rev-parse --abbrev-ref HEAD)
+
+for F in ./50kafka.yml ./zookeeper/50pzoo.yml ./zookeeper/51zoo.yml
+do
+  annotate revs "$REVS" $F
+  annotate build "$END_BRANCH_GIT" $F
+done
-- 
cgit v1.2.3