From 2fa336d142661f7b902ed36ae87a0ad98f97febb Mon Sep 17 00:00:00 2001
From: Timofey Turenko <timofey.turenko@mariadb.com>
Date: Wed, 7 Aug 2019 14:58:19 +0300
Subject: [PATCH 1/6] create symlink for sles15

---
 BUILD/mdbci/copy_repos.sh | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/BUILD/mdbci/copy_repos.sh b/BUILD/mdbci/copy_repos.sh
index 71c3483ec..d07cc356e 100755
--- a/BUILD/mdbci/copy_repos.sh
+++ b/BUILD/mdbci/copy_repos.sh
@@ -28,10 +28,14 @@ if [ "$box_type" == "RPM" ] ; then
                 cd $path_prefix/$platform
                 ln -s $platform_version "$platform_version"server
                 ln -s $platform_version "$platform_version"Server
+                cd ..
                 if [ "$platform" == "centos" ] ; then
-                        cd ..
                         ln -s centos rhel
                 fi
+                if [ "$platform" == "opensuse" ] ; then
+                        ln -s opensuse/$paltform_version sles/$paltform_version
+                fi
+
 
   eval "cat <<EOF
 $(<${script_dir}/templates/repository-config/rpm.json.template)

From 5d0112c3979b3450df65382fb776e952ad80cd8c Mon Sep 17 00:00:00 2001
From: Timofey Turenko <timofey.turenko@mariadb.com>
Date: Wed, 7 Aug 2019 15:41:18 +0300
Subject: [PATCH 2/6] add sles directory creation

---
 BUILD/mdbci/copy_repos.sh | 1 +
 1 file changed, 1 insertion(+)

diff --git a/BUILD/mdbci/copy_repos.sh b/BUILD/mdbci/copy_repos.sh
index d07cc356e..4cd37de3c 100755
--- a/BUILD/mdbci/copy_repos.sh
+++ b/BUILD/mdbci/copy_repos.sh
@@ -33,6 +33,7 @@ if [ "$box_type" == "RPM" ] ; then
                         ln -s centos rhel
                 fi
                 if [ "$platform" == "opensuse" ] ; then
+                        mkdir -p sles
                         ln -s opensuse/$paltform_version sles/$paltform_version
                 fi
 

From bb43e6193e068c36edf5abecede19d7db7b6eece Mon Sep 17 00:00:00 2001
From: Timofey Turenko <timofey.turenko@mariadb.com>
Date: Wed, 7 Aug 2019 16:00:12 +0300
Subject: [PATCH 3/6] fix typo in copy_repos.sh

---
 BUILD/mdbci/copy_repos.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/BUILD/mdbci/copy_repos.sh b/BUILD/mdbci/copy_repos.sh
index 4cd37de3c..9a3bd91f3 100755
--- a/BUILD/mdbci/copy_repos.sh
+++ b/BUILD/mdbci/copy_repos.sh
@@ -34,7 +34,7 @@ if [ "$box_type" == "RPM" ] ; then
                 fi
                 if [ "$platform" == "opensuse" ] ; then
                         mkdir -p sles
-                        ln -s opensuse/$paltform_version sles/$paltform_version
+                        ln -s opensuse/$platform_version sles/$platform_version
                 fi
 
 

From 169fb256edb014af0068be4861d0de6565c6a21e Mon Sep 17 00:00:00 2001
From: Timofey Turenko <timofey.turenko@mariadb.com>
Date: Wed, 7 Aug 2019 16:02:40 +0300
Subject: [PATCH 4/6] Create symlink for sles15

Currently build is executed for OpenSuse 15 and SLES15 repo is not available. To avoid
missing repo symlink sles -> opensuse is created
---
 BUILD/mdbci/copy_repos.sh | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/BUILD/mdbci/copy_repos.sh b/BUILD/mdbci/copy_repos.sh
index 71c3483ec..9a3bd91f3 100755
--- a/BUILD/mdbci/copy_repos.sh
+++ b/BUILD/mdbci/copy_repos.sh
@@ -28,10 +28,15 @@ if [ "$box_type" == "RPM" ] ; then
                 cd $path_prefix/$platform
                 ln -s $platform_version "$platform_version"server
                 ln -s $platform_version "$platform_version"Server
+                cd ..
                 if [ "$platform" == "centos" ] ; then
-                        cd ..
                         ln -s centos rhel
                 fi
+                if [ "$platform" == "opensuse" ] ; then
+                        mkdir -p sles
+                        ln -s opensuse/$platform_version sles/$platform_version
+                fi
+
 
   eval "cat <<EOF
 $(<${script_dir}/templates/repository-config/rpm.json.template)

From 2b0fe14676b27f9e6045dc9de9ed175bcd2d9a95 Mon Sep 17 00:00:00 2001
From: Timofey Turenko <timofey.turenko@mariadb.com>
Date: Wed, 7 Aug 2019 19:45:52 +0300
Subject: [PATCH 5/6] fix sles link creation

---
 BUILD/mdbci/copy_repos.sh | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/BUILD/mdbci/copy_repos.sh b/BUILD/mdbci/copy_repos.sh
index 9a3bd91f3..517ef82dd 100755
--- a/BUILD/mdbci/copy_repos.sh
+++ b/BUILD/mdbci/copy_repos.sh
@@ -34,7 +34,9 @@ if [ "$box_type" == "RPM" ] ; then
                 fi
                 if [ "$platform" == "opensuse" ] ; then
                         mkdir -p sles
-                        ln -s opensuse/$platform_version sles/$platform_version
+			cd sles
+                        ln -s ../opensuse/$platform_version $platform_version
+                        cd ..
                 fi
 
 

From 910990115c1ef3ce3f28954766c0d11fc4aa0050 Mon Sep 17 00:00:00 2001
From: Timofey Turenko <timofey.turenko@mariadb.com>
Date: Thu, 8 Aug 2019 16:58:07 +0300
Subject: [PATCH 6/6] add Docker to build VM temlates

Now Docker is installed to VM which are used to build Maxscale. It allows to run tests which require Docker without installing it
during build process.
---
 BUILD/mdbci/templates/build.json.template | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/BUILD/mdbci/templates/build.json.template b/BUILD/mdbci/templates/build.json.template
index 08f93905a..9f3a21b6e 100644
--- a/BUILD/mdbci/templates/build.json.template
+++ b/BUILD/mdbci/templates/build.json.template
@@ -3,7 +3,11 @@
   {
         "hostname" : "default",
         "memory_size" : "4096",
-        "box" : "$box"
+        "box" : "$box",
+        "product" : {
+                "name": "docker"
+        }
+
   }
 }