From 2dc200087f585e93838d652bab2a5487672c9087 Mon Sep 17 00:00:00 2001
From: vdelendik <vdelendik@zebrunner.com>
Date: Fri, 11 Mar 2022 10:16:51 +0000
Subject: [PATCH 01/17] switched to the latest selenoid

---
 selenoid | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/selenoid b/selenoid
index 25bb068d..10af3b1d 160000
--- a/selenoid
+++ b/selenoid
@@ -1 +1 @@
-Subproject commit 25bb068de8e7ed48c57987b3ef252a0bdf6cd4d9
+Subproject commit 10af3b1d04fd8f03504695f408a59603bf2950b4

From 6fefeffa6319f1a89ac52d2fd837108bb9540bbe Mon Sep 17 00:00:00 2001
From: vdelendik <vdelendik@zebrunner.com>
Date: Mon, 20 Jun 2022 21:32:05 +0000
Subject: [PATCH 02/17] #520: bump up to mcloud:2.2

---
 mcloud | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/mcloud b/mcloud
index 0e1a9c8c..be28c4f8 160000
--- a/mcloud
+++ b/mcloud
@@ -1 +1 @@
-Subproject commit 0e1a9c8c644d36961ed8962c72569e12d2c65e74
+Subproject commit be28c4f8c366c69429328fa19e137783d9e2a2a5

From 8c92212595df8fa66cc16794e49a358831b43a49 Mon Sep 17 00:00:00 2001
From: vdelendik <vdelendik@zebrunner.com>
Date: Fri, 15 Jul 2022 19:31:14 +0000
Subject: [PATCH 03/17] bump up to the latest selenoid

---
 selenoid | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/selenoid b/selenoid
index 10af3b1d..2bc45956 160000
--- a/selenoid
+++ b/selenoid
@@ -1 +1 @@
-Subproject commit 10af3b1d04fd8f03504695f408a59603bf2950b4
+Subproject commit 2bc45956fcbaf1ee930b4d64652b3e52f49c1525

From b91e09264dce7712c51324fc0937e12dc416de02 Mon Sep 17 00:00:00 2001
From: vdelendik <vdelendik@zebrunner.com>
Date: Fri, 15 Jul 2022 19:49:15 +0000
Subject: [PATCH 04/17] switched to the latest jenkins

---
 jenkins | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/jenkins b/jenkins
index 36270e63..886e5e34 160000
--- a/jenkins
+++ b/jenkins
@@ -1 +1 @@
-Subproject commit 36270e63ee20fec9717590d10b67f63eefef00cc
+Subproject commit 886e5e34f2569f3bfd48af24f1554247b1889e3b

From a662d8fe9ed79da55e9d8419d80b4e52935c0d66 Mon Sep 17 00:00:00 2001
From: vdelendik <vdelendik@zebrunner.com>
Date: Thu, 21 Jul 2022 10:08:37 +0000
Subject: [PATCH 05/17] #411: fixed minio storage disabling

---
 zebrunner.sh | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/zebrunner.sh b/zebrunner.sh
index b72c8944..aead91ac 100755
--- a/zebrunner.sh
+++ b/zebrunner.sh
@@ -49,6 +49,10 @@
 
     # Reporting is obligatory component now. But to be able to disable it we can register REPORTING_DISABLED=1 env variable before setup
     if [[ $ZBR_REPORTING_ENABLED -eq 1 && -z $REPORTING_DISABLED ]]; then
+      # 411 There is ".disabled" present in minio-storage after setup all components
+      rm -f reporting/.disabled
+      rm -f reporting/minio-storage/.disabled
+
       set_reporting_settings
       reporting/zebrunner.sh setup
     else

From a0bfe9b0a83cfadd2ebdf8151571dd24779e0b55 Mon Sep 17 00:00:00 2001
From: vdelendik <vdelendik@zebrunner.com>
Date: Thu, 21 Jul 2022 15:05:40 +0000
Subject: [PATCH 06/17] #455: improved restore warn content

---
 zebrunner.sh | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/zebrunner.sh b/zebrunner.sh
index aead91ac..51389000 100755
--- a/zebrunner.sh
+++ b/zebrunner.sh
@@ -374,7 +374,15 @@
       exit -1
     fi
 
-    confirm "" "      Your services will be stopped and current data might be lost. Do you want to do a restore now?" "n"
+    if [ ! -f backup/settings.env.bak ]; then
+      echo_warning "You have to backup something in advance using: ./zebrunner.sh backup"
+      echo_telegram
+      exit -1
+
+    fi
+
+    echo "      Your services will be stopped and current data might be lost."
+    confirm "" "      Do you want to do a restore to \"`date -r backup/settings.env.bak`\" state?" "n"
     if [[ $? -eq 0 ]]; then
       exit
     fi

From 5f25b21a98caa271c0c734bd7799ac092ca00a24 Mon Sep 17 00:00:00 2001
From: vdelendik <vdelendik@zebrunner.com>
Date: Thu, 21 Jul 2022 15:50:55 +0000
Subject: [PATCH 07/17] #485: integrated nginx conf reload for every 6h

---
 docker-compose.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/docker-compose.yml b/docker-compose.yml
index 968f9f24..7cf15bd0 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -13,6 +13,7 @@ services:
      - ./nginx/ssl:/etc/nginx/ssl:ro
      - ./nginx/grid:/usr/share/nginx/html/grid
      - ./selenoid/video:/usr/share/nginx/video:ro
+    command: "/bin/sh -c 'while :; do sleep 6h & wait $${!}; nginx -s reload; done & nginx -g \"daemon off;\"'"
     logging:
      options:
       max-size: "512m"

From f48348257ed08aeb585eccaa263f52fa9a6f4b4d Mon Sep 17 00:00:00 2001
From: vdelendik <vdelendik@zebrunner.com>
Date: Sat, 23 Jul 2022 09:56:50 +0000
Subject: [PATCH 08/17] #491: moved upgrade step to the updated sub-modules via
 setup script

---
 jenkins      |  2 +-
 mcloud       |  2 +-
 patch/2.1.sh | 47 +++++++++++++++++++++++++++++++++++++++++++++++
 selenoid     |  2 +-
 zebrunner.sh | 12 ++++++++++--
 5 files changed, 60 insertions(+), 5 deletions(-)
 create mode 100755 patch/2.1.sh

diff --git a/jenkins b/jenkins
index 886e5e34..329b0a34 160000
--- a/jenkins
+++ b/jenkins
@@ -1 +1 @@
-Subproject commit 886e5e34f2569f3bfd48af24f1554247b1889e3b
+Subproject commit 329b0a3404f74f578eb2272a2cb35f4009fc8d22
diff --git a/mcloud b/mcloud
index be28c4f8..f05dd967 160000
--- a/mcloud
+++ b/mcloud
@@ -1 +1 @@
-Subproject commit be28c4f8c366c69429328fa19e137783d9e2a2a5
+Subproject commit f05dd96730f4559d7dbde240fa60ed339a9ff1b0
diff --git a/patch/2.1.sh b/patch/2.1.sh
new file mode 100755
index 00000000..f45c8bc0
--- /dev/null
+++ b/patch/2.1.sh
@@ -0,0 +1,47 @@
+#!/bin/bash
+
+# shellcheck disable=SC1091
+source patch/utility.sh
+
+TARGET_VERSION=2.1
+
+source backup/settings.env
+SOURCE_VERSION=${ZBR_VERSION}
+echo SOURCE_VERSION: $SOURCE_VERSION
+
+if ! [[ "${TARGET_VERSION}" > "${SOURCE_VERSION}" ]]; then
+  #target Zebrunner version less or equal existing
+  echo "No need to perform upgrade to ${TARGET_VERSION}"
+  exit 2
+fi
+
+echo "Upgrading Zebrunner from ${SOURCE_VERSION} to ${TARGET_VERSION}"
+
+#apply mcloud changes
+if [[ ! -f mcloud/.disabled ]] ; then
+  cp mcloud/.env mcloud/.env_2.0
+  cp mcloud/variables.env  mcloud/variables.env_2.0
+
+  mcloud/zebrunner.sh setup
+fi
+
+#apply jenkins changes
+if [[ ! -f jenkins/.disabled ]] ; then
+  cp jenkins/variables.env jenkins/variables.env_2.0
+  jenkins/zebrunner.sh setup
+fi
+
+# apply selenoid changes
+if [[ ! -f selenoid/.disabled ]] ; then
+  cp selenoid/.env selenoid/.env_2.0
+  selenoid/zebrunner.sh setup
+fi
+
+
+echo "Upgrade to ${TARGET_VERSION} finished successfully"
+
+#remember successfully applied version in settings.env file
+export ZBR_VERSION=${TARGET_VERSION}
+
+#save information about upgraded zebrunner version
+export_settings
diff --git a/selenoid b/selenoid
index 2bc45956..ad7b6784 160000
--- a/selenoid
+++ b/selenoid
@@ -1 +1 @@
-Subproject commit 2bc45956fcbaf1ee930b4d64652b3e52f49c1525
+Subproject commit ad7b6784fe3a83d995dd3317bbff1b1a115a39e1
diff --git a/zebrunner.sh b/zebrunner.sh
index 51389000..7902646a 100755
--- a/zebrunner.sh
+++ b/zebrunner.sh
@@ -25,7 +25,7 @@
     fi
 
     export ZBR_INSTALLER=1
-    export ZBR_VERSION=2.0
+    export ZBR_VERSION=2.1
     set_global_settings
 
     cp .env.original .env
@@ -500,8 +500,16 @@
       exit -1
     fi
 
+    patch/2.1.sh
+    p2_1=$?
+    if [[ ${p2_1} -eq 1 ]]; then
+      echo "ERROR! 2.1 patchset was not applied correctly!"
+      exit -1
+    fi
+
+
     # IMPORTANT! Increment latest verification to new version, i.e. p1_3, p1_4 etc to verify latest upgrade status
-    if [[ ${p2_0} -eq 2 ]]; then
+    if [[ ${p2_1} -eq 2 ]]; then
       echo "No need to restart service as nothing was upgraded."
       exit -1
     fi

From fab79307da586d128ba86e7f304e07a3b11e06d4 Mon Sep 17 00:00:00 2001
From: vdelendik <vdelendik@zebrunner.com>
Date: Sat, 23 Jul 2022 10:07:05 +0000
Subject: [PATCH 09/17] hide useless echo messages

---
 patch/2.0.sh | 2 +-
 patch/2.1.sh | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/patch/2.0.sh b/patch/2.0.sh
index 70e2351d..eb9ef0ec 100755
--- a/patch/2.0.sh
+++ b/patch/2.0.sh
@@ -7,7 +7,7 @@ TARGET_VERSION=2.0
 
 source backup/settings.env
 SOURCE_VERSION=${ZBR_VERSION}
-echo SOURCE_VERSION: $SOURCE_VERSION
+#echo SOURCE_VERSION: $SOURCE_VERSION
 
 if ! [[ "${TARGET_VERSION}" > "${SOURCE_VERSION}" ]]; then
   #target Zebrunner version less or equal existing
diff --git a/patch/2.1.sh b/patch/2.1.sh
index f45c8bc0..9e161981 100755
--- a/patch/2.1.sh
+++ b/patch/2.1.sh
@@ -7,7 +7,7 @@ TARGET_VERSION=2.1
 
 source backup/settings.env
 SOURCE_VERSION=${ZBR_VERSION}
-echo SOURCE_VERSION: $SOURCE_VERSION
+#echo SOURCE_VERSION: $SOURCE_VERSION
 
 if ! [[ "${TARGET_VERSION}" > "${SOURCE_VERSION}" ]]; then
   #target Zebrunner version less or equal existing

From 5ddff9b4ce9e103ca14a260abb8a5c0b0c08cfb8 Mon Sep 17 00:00:00 2001
From: vdelendik <vdelendik@zebrunner.com>
Date: Sat, 23 Jul 2022 10:15:50 +0000
Subject: [PATCH 10/17] switched to the latest mcloud-stf

---
 mcloud | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/mcloud b/mcloud
index f05dd967..9f7a4d58 160000
--- a/mcloud
+++ b/mcloud
@@ -1 +1 @@
-Subproject commit f05dd96730f4559d7dbde240fa60ed339a9ff1b0
+Subproject commit 9f7a4d5820f9f1c1e40c7a645e5eb4b63f15bbb8

From 98a974a7334bc7cc3926c97bc439561e1e45acbb Mon Sep 17 00:00:00 2001
From: vdelendik <vdelendik@zebrunner.com>
Date: Mon, 25 Jul 2022 16:38:19 +0000
Subject: [PATCH 11/17] switched to the latest submodules

---
 jenkins  | 2 +-
 mcloud   | 2 +-
 selenoid | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/jenkins b/jenkins
index 329b0a34..9400bfbd 160000
--- a/jenkins
+++ b/jenkins
@@ -1 +1 @@
-Subproject commit 329b0a3404f74f578eb2272a2cb35f4009fc8d22
+Subproject commit 9400bfbd8cd83e3098d44149138662d97c5d50e8
diff --git a/mcloud b/mcloud
index 9f7a4d58..71401cc9 160000
--- a/mcloud
+++ b/mcloud
@@ -1 +1 @@
-Subproject commit 9f7a4d5820f9f1c1e40c7a645e5eb4b63f15bbb8
+Subproject commit 71401cc9c17873dbce38a4d775331fc1d48ac317
diff --git a/selenoid b/selenoid
index ad7b6784..4aa180c9 160000
--- a/selenoid
+++ b/selenoid
@@ -1 +1 @@
-Subproject commit ad7b6784fe3a83d995dd3317bbff1b1a115a39e1
+Subproject commit 4aa180c907115c3d2ed52c70671fd681ab902bca

From 04296e55bf6d60e5f1c45e9ba9ae1e28b8d7aef1 Mon Sep 17 00:00:00 2001
From: vdelendik <vdelendik@zebrunner.com>
Date: Mon, 25 Jul 2022 16:40:24 +0000
Subject: [PATCH 12/17] switched to latest jenkins

---
 jenkins | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/jenkins b/jenkins
index 9400bfbd..857e6050 160000
--- a/jenkins
+++ b/jenkins
@@ -1 +1 @@
-Subproject commit 9400bfbd8cd83e3098d44149138662d97c5d50e8
+Subproject commit 857e6050bdd504118f9c783978a32a82f261771f

From 03607443efa0bc90f4243f5931d94f3d23d86681 Mon Sep 17 00:00:00 2001
From: vdelendik <vdelendik@zebrunner.com>
Date: Mon, 25 Jul 2022 16:44:45 +0000
Subject: [PATCH 13/17] switched to the latest jenkins

---
 jenkins | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/jenkins b/jenkins
index 857e6050..d3ce1dc9 160000
--- a/jenkins
+++ b/jenkins
@@ -1 +1 @@
-Subproject commit 857e6050bdd504118f9c783978a32a82f261771f
+Subproject commit d3ce1dc9eef991f5124366bb8296479e2a35b96e

From 02217313c39584438cdc90927acbd62e7e4a9b62 Mon Sep 17 00:00:00 2001
From: vdelendik <vdelendik@zebrunner.com>
Date: Mon, 25 Jul 2022 16:47:50 +0000
Subject: [PATCH 14/17] switched to the latest submodules

---
 mcloud   | 2 +-
 selenoid | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/mcloud b/mcloud
index 71401cc9..e8dec2a7 160000
--- a/mcloud
+++ b/mcloud
@@ -1 +1 @@
-Subproject commit 71401cc9c17873dbce38a4d775331fc1d48ac317
+Subproject commit e8dec2a7d26ce0ed606f46448404025581c66b66
diff --git a/selenoid b/selenoid
index 4aa180c9..a9d8d27a 160000
--- a/selenoid
+++ b/selenoid
@@ -1 +1 @@
-Subproject commit 4aa180c907115c3d2ed52c70671fd681ab902bca
+Subproject commit a9d8d27afdbe26ecf9ade34209cc68494455ad83

From 363ebf11cb1a28c35c29ae5efe48c3d996f36af6 Mon Sep 17 00:00:00 2001
From: vdelendik <vdelendik@zebrunner.com>
Date: Fri, 29 Jul 2022 11:55:31 +0000
Subject: [PATCH 15/17] switched to the released 1.8.1 jenkins

---
 jenkins | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/jenkins b/jenkins
index d3ce1dc9..8f1370b3 160000
--- a/jenkins
+++ b/jenkins
@@ -1 +1 @@
-Subproject commit d3ce1dc9eef991f5124366bb8296479e2a35b96e
+Subproject commit 8f1370b311d97ba0950ab65b30d01a6894292b12

From b429a9117fe45762be61ee01a9d4fc332592188f Mon Sep 17 00:00:00 2001
From: vdelendik <vdelendik@zebrunner.com>
Date: Fri, 29 Jul 2022 11:58:24 +0000
Subject: [PATCH 16/17] switched to released 2.2.1 mcloud

---
 mcloud | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/mcloud b/mcloud
index e8dec2a7..d7fff057 160000
--- a/mcloud
+++ b/mcloud
@@ -1 +1 @@
-Subproject commit e8dec2a7d26ce0ed606f46448404025581c66b66
+Subproject commit d7fff0572eb6e10373fc1029e719f82e54f3b346

From 58ff31e279859903a66c0d79ef0d9fe5cba70498 Mon Sep 17 00:00:00 2001
From: vdelendik <vdelendik@zebrunner.com>
Date: Fri, 29 Jul 2022 12:00:11 +0000
Subject: [PATCH 17/17] switched to the released 1.6 selenoid

---
 selenoid | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/selenoid b/selenoid
index a9d8d27a..74d04332 160000
--- a/selenoid
+++ b/selenoid
@@ -1 +1 @@
-Subproject commit a9d8d27afdbe26ecf9ade34209cc68494455ad83
+Subproject commit 74d04332fa5d2ce28e2365128b9fd4c0ec1bf508