From d87d846a44c64c9b6e42014501faad9f631b9ee5 Mon Sep 17 00:00:00 2001
From: Vahid Hashemian <vahidhashemian@us.ibm.com>
Date: Mon, 3 Jun 2019 18:44:27 -0700
Subject: [PATCH] MINOR: Add 2.2.1 to system tests

---
 tests/docker/Dockerfile    | 1 +
 tests/kafkatest/version.py | 3 ++-
 vagrant/base.sh            | 6 ++++--
 3 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/tests/docker/Dockerfile b/tests/docker/Dockerfile
index 665dc270405cf..3f54631f20365 100644
--- a/tests/docker/Dockerfile
+++ b/tests/docker/Dockerfile
@@ -55,6 +55,7 @@ RUN mkdir -p "/opt/kafka-1.1.1" && chmod a+rw /opt/kafka-1.1.1 && curl -s "$KAFK
 RUN mkdir -p "/opt/kafka-2.0.1" && chmod a+rw /opt/kafka-2.0.1 && curl -s "$KAFKA_MIRROR/kafka_2.12-2.0.1.tgz" | tar xz --strip-components=1 -C "/opt/kafka-2.0.1"
 RUN mkdir -p "/opt/kafka-2.1.1" && chmod a+rw /opt/kafka-2.1.1 && curl -s "$KAFKA_MIRROR/kafka_2.12-2.1.1.tgz" | tar xz --strip-components=1 -C "/opt/kafka-2.1.1"
 RUN mkdir -p "/opt/kafka-2.2.0" && chmod a+rw /opt/kafka-2.2.0 && curl -s "$KAFKA_MIRROR/kafka_2.12-2.2.0.tgz" | tar xz --strip-components=1 -C "/opt/kafka-2.2.0"
+RUN mkdir -p "/opt/kafka-2.2.1" && chmod a+rw /opt/kafka-2.2.1 && curl -s "$KAFKA_MIRROR/kafka_2.12-2.2.1.tgz" | tar xz --strip-components=1 -C "/opt/kafka-2.2.1"
 
 # Streams test dependencies
 RUN curl -s "$KAFKA_MIRROR/kafka-streams-0.10.0.1-test.jar" -o /opt/kafka-0.10.0.1/libs/kafka-streams-0.10.0.1-test.jar
diff --git a/tests/kafkatest/version.py b/tests/kafkatest/version.py
index 403da03b2f19f..1b98e52a35256 100644
--- a/tests/kafkatest/version.py
+++ b/tests/kafkatest/version.py
@@ -121,4 +121,5 @@ def get_version(node=None):
 
 # 2.2.x versions
 V_2_2_0 = KafkaVersion("2.2.0")
-LATEST_2_2 = V_2_2_0
+V_2_2_1 = KafkaVersion("2.2.1")
+LATEST_2_2 = V_2_2_1
diff --git a/vagrant/base.sh b/vagrant/base.sh
index 6c86815876d79..9a1cd65aaf812 100755
--- a/vagrant/base.sh
+++ b/vagrant/base.sh
@@ -43,7 +43,7 @@ if [ -z `which javac` ]; then
     apt-get -y update
     apt-get install -y software-properties-common python-software-properties binutils java-common
 
-    echo "===> Installing JDK..." 
+    echo "===> Installing JDK..."
 
     mkdir -p /opt/jdk
     cd /opt/jdk
@@ -52,7 +52,7 @@ if [ -z `which javac` ]; then
     cd $JDK_MAJOR
     fetch_jdk_tgz $JDK_FULL
     tar x --strip-components=1 -zf $(path_to_jdk_cache $JDK_FULL)
-    for bin in /opt/jdk/$JDK_MAJOR/bin/* ; do 
+    for bin in /opt/jdk/$JDK_MAJOR/bin/* ; do
       name=$(basename $bin)
       update-alternatives --install /usr/bin/$name $name $bin 1081 && update-alternatives --set $name $bin
     done
@@ -135,6 +135,8 @@ get_kafka 2.1.1 2.12
 chmod a+rw /opt/kafka-2.1.1
 get_kafka 2.2.0 2.12
 chmod a+rw /opt/kafka-2.2.0
+get_kafka 2.2.1 2.12
+chmod a+rw /opt/kafka-2.2.1
 
 # For EC2 nodes, we want to use /mnt, which should have the local disk. On local
 # VMs, we can just create it if it doesn't exist and use it like we'd use