From 0104308e8221e788ec19f136c80ed5d4c9f3202d Mon Sep 17 00:00:00 2001
From: Mykola Borchuk <it.volu@gmail.com>
Date: Sun, 14 Mar 2021 13:06:04 +0200
Subject: [PATCH 001/153] FOLIO-2982 Added Sleep stage for reading logs on the
 server

---
 Jenkinsfile.integration | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/Jenkinsfile.integration b/Jenkinsfile.integration
index ce3add5..6d31aa3 100644
--- a/Jenkinsfile.integration
+++ b/Jenkinsfile.integration
@@ -77,6 +77,10 @@ node('jenkins-agent-java11') {
               sharedLib.runIntegrationTests(context)
             }
           }
+
+          stage("Sleep for checking access to server and reading logs") {
+            sleep(600)
+          }
         } catch (e) {
           currentBuild.result = 'FAILURE'
           throw e

From b7495b43c386e6aa0b634fbeab6c2f3676367a91 Mon Sep 17 00:00:00 2001
From: Mykola Borchuk <it.volu@gmail.com>
Date: Sun, 14 Mar 2021 13:22:12 +0200
Subject: [PATCH 002/153] FOLIO-2982 Added Sleep stage for reading logs on the
 server

---
 shared.groovy | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/shared.groovy b/shared.groovy
index 53c7e2f..2463b95 100644
--- a/shared.groovy
+++ b/shared.groovy
@@ -164,7 +164,11 @@ def bootstrapModules(ctx) {
   echo "mods: ${mods}"
   mods = registerMods(mods, ctx.mdRepo, ctx.okapiIp)
   echo "valid mods: ${mods}"
+  echo "Sleeping before deployMods"
+  sleep 600
   deployMods(mods, ctx.okapiIp, ctx.modsIp, ctx.modsPvtIp, ctx.dbPvtIp, ctx.tenant, ctx.sshCmd, ctx.sshUser)
+  echo "Speeping after deployMods"
+  sleep 600
 }
 
 def populateData(ctx) {

From 663c08b9cf0a97329a7c146819abc663219b9ce0 Mon Sep 17 00:00:00 2001
From: Mykola Borchuk <it.volu@gmail.com>
Date: Sun, 14 Mar 2021 13:45:51 +0200
Subject: [PATCH 003/153] FOLIO-2982 Change sleeps in files

---
 Jenkinsfile.integration | 5 +----
 shared.groovy           | 4 ----
 2 files changed, 1 insertion(+), 8 deletions(-)

diff --git a/Jenkinsfile.integration b/Jenkinsfile.integration
index 6d31aa3..19e683f 100644
--- a/Jenkinsfile.integration
+++ b/Jenkinsfile.integration
@@ -77,12 +77,9 @@ node('jenkins-agent-java11') {
               sharedLib.runIntegrationTests(context)
             }
           }
-
-          stage("Sleep for checking access to server and reading logs") {
-            sleep(600)
-          }
         } catch (e) {
           currentBuild.result = 'FAILURE'
+          sleep (600)
           throw e
         } finally {
           stage("Tear down environment") {
diff --git a/shared.groovy b/shared.groovy
index 2463b95..53c7e2f 100644
--- a/shared.groovy
+++ b/shared.groovy
@@ -164,11 +164,7 @@ def bootstrapModules(ctx) {
   echo "mods: ${mods}"
   mods = registerMods(mods, ctx.mdRepo, ctx.okapiIp)
   echo "valid mods: ${mods}"
-  echo "Sleeping before deployMods"
-  sleep 600
   deployMods(mods, ctx.okapiIp, ctx.modsIp, ctx.modsPvtIp, ctx.dbPvtIp, ctx.tenant, ctx.sshCmd, ctx.sshUser)
-  echo "Speeping after deployMods"
-  sleep 600
 }
 
 def populateData(ctx) {

From 5ddcce18e2046ff322451636d5b868d9be9b79f5 Mon Sep 17 00:00:00 2001
From: Mykola Borchuk <it.volu@gmail.com>
Date: Sun, 14 Mar 2021 13:56:16 +0200
Subject: [PATCH 004/153] FOLIO-2982 Fixed sleep

---
 Jenkinsfile.integration | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Jenkinsfile.integration b/Jenkinsfile.integration
index 19e683f..cd0caf0 100644
--- a/Jenkinsfile.integration
+++ b/Jenkinsfile.integration
@@ -79,7 +79,7 @@ node('jenkins-agent-java11') {
           }
         } catch (e) {
           currentBuild.result = 'FAILURE'
-          sleep (600)
+          sleep 600
           throw e
         } finally {
           stage("Tear down environment") {

From ddb8963dc7dd377b15f2ade7130358a962732b2b Mon Sep 17 00:00:00 2001
From: Mykola Borchuk <it.volu@gmail.com>
Date: Mon, 15 Mar 2021 15:41:27 +0200
Subject: [PATCH 005/153] FOLIO-2982 Added the config file for
 mod-inventory-storage

---
 config/mod-inventory-storage.sh | 2 ++
 shared.groovy                   | 6 ++++++
 2 files changed, 8 insertions(+)
 create mode 100644 config/mod-inventory-storage.sh

diff --git a/config/mod-inventory-storage.sh b/config/mod-inventory-storage.sh
new file mode 100644
index 0000000..2312118
--- /dev/null
+++ b/config/mod-inventory-storage.sh
@@ -0,0 +1,2 @@
+docker run -d --rm --name ${modName} -e 'DB_HOST=${dbHost}' -e 'DB_PORT=5432' -e 'DB_DATABASE=folio' -e 'DB_USERNAME=folio' -e 'DB_PASSWORD=folioadmin' -e 'KAFKA_HOST=${dbHost}' -e 'KAFKA_PORT=9092' -e 'OKAPI_URL=http://${okapiIp}:9130' -p${port}:8081 folioci/${modName}:${modVer}
+docker run -d --rm --name ${modName} --mount type=bind,source=/tmp/folio-conf,target=/folio-conf -e 'KAFKA_HOST=${dbHost}' -e 'KAFKA_PORT=9092' -e 'JAVA_OPTIONS=-Dorg.folio.metadata.inventory.storage.type=okapi' -p${port}:8081 folioci/${modName}:${modVer} db_connection=/folio-conf/pg.json
\ No newline at end of file
diff --git a/shared.groovy b/shared.groovy
index 53c7e2f..db35a7e 100644
--- a/shared.groovy
+++ b/shared.groovy
@@ -550,6 +550,12 @@ def deployMods(mods, okapiIp, modsIp, modsPvtIp, dbPvtIp, tenant, sshCmd, sshUse
       }
     }
     // mod-pubsub has different env variables
+    if (modName.equals("mod-inventory-storage")) {
+      modJob = readFile("config/mod-inventory-storage.sh").trim()
+      modJob = modJob.replace('${dbHost}', dbPvtIp)
+      modJob = modJob.replace('${okapiIp}', okapiIp)
+    }
+    // mod-pubsub has different env variables
     if (modName.equals("mod-pubsub")) {
       modJob = readFile("config/mod-pubsub.sh").trim()
       modJob = modJob.replace('${dbHost}', dbPvtIp)

From 10ed4c7ee0e873afb5e4f8941d96c30780aadd22 Mon Sep 17 00:00:00 2001
From: Mykola Borchuk <it.volu@gmail.com>
Date: Mon, 15 Mar 2021 15:47:24 +0200
Subject: [PATCH 006/153] FOLIO-2982 Changed time out

---
 Jenkinsfile.integration | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/Jenkinsfile.integration b/Jenkinsfile.integration
index cd0caf0..ece3178 100644
--- a/Jenkinsfile.integration
+++ b/Jenkinsfile.integration
@@ -79,12 +79,11 @@ node('jenkins-agent-java11') {
           }
         } catch (e) {
           currentBuild.result = 'FAILURE'
-          sleep 600
           throw e
         } finally {
           stage("Tear down environment") {
             sharedLib.notifySlack(currentBuild.result)
-            sleep 60
+            sleep 1800
             sharedLib.teardownEnv(context)
           }
         }

From 552300ee1f80f3f6ea843a0b08446c29336e4349 Mon Sep 17 00:00:00 2001
From: Mykola Borchuk <it.volu@gmail.com>
Date: Mon, 15 Mar 2021 16:11:32 +0200
Subject: [PATCH 007/153] FOLIO-2982 Deleted unneeded line

---
 config/mod-inventory-storage.sh | 1 -
 1 file changed, 1 deletion(-)

diff --git a/config/mod-inventory-storage.sh b/config/mod-inventory-storage.sh
index 2312118..354fbcd 100644
--- a/config/mod-inventory-storage.sh
+++ b/config/mod-inventory-storage.sh
@@ -1,2 +1 @@
-docker run -d --rm --name ${modName} -e 'DB_HOST=${dbHost}' -e 'DB_PORT=5432' -e 'DB_DATABASE=folio' -e 'DB_USERNAME=folio' -e 'DB_PASSWORD=folioadmin' -e 'KAFKA_HOST=${dbHost}' -e 'KAFKA_PORT=9092' -e 'OKAPI_URL=http://${okapiIp}:9130' -p${port}:8081 folioci/${modName}:${modVer}
 docker run -d --rm --name ${modName} --mount type=bind,source=/tmp/folio-conf,target=/folio-conf -e 'KAFKA_HOST=${dbHost}' -e 'KAFKA_PORT=9092' -e 'JAVA_OPTIONS=-Dorg.folio.metadata.inventory.storage.type=okapi' -p${port}:8081 folioci/${modName}:${modVer} db_connection=/folio-conf/pg.json
\ No newline at end of file

From c42abf39aa2a5bc150a0e6bfe7f7e4da2cb1c875 Mon Sep 17 00:00:00 2001
From: Mykola Borchuk <it.volu@gmail.com>
Date: Mon, 15 Mar 2021 17:36:40 +0200
Subject: [PATCH 008/153] FOLIO-2982 Deleted the docker parameter '--rm'

---
 config/mods.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/config/mods.sh b/config/mods.sh
index 88c4350..61f61f7 100644
--- a/config/mods.sh
+++ b/config/mods.sh
@@ -1 +1 @@
-docker run -d --rm --name ${modName} --mount type=bind,source=/tmp/folio-conf,target=/folio-conf -e 'JAVA_OPTIONS=-Dorg.folio.metadata.inventory.storage.type=okapi' -p${port}:8081 folioci/${modName}:${modVer} db_connection=/folio-conf/pg.json
+docker run -d --name ${modName} --mount type=bind,source=/tmp/folio-conf,target=/folio-conf -e 'JAVA_OPTIONS=-Dorg.folio.metadata.inventory.storage.type=okapi' -p${port}:8081 folioci/${modName}:${modVer} db_connection=/folio-conf/pg.json

From 90118d87e0840b9684c006fb81e5da12bc9afc68 Mon Sep 17 00:00:00 2001
From: Mykola Borchuk <it.volu@gmail.com>
Date: Mon, 15 Mar 2021 17:39:55 +0200
Subject: [PATCH 009/153] FOLIO-2982 Returned the sleep time

---
 Jenkinsfile.integration | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Jenkinsfile.integration b/Jenkinsfile.integration
index ece3178..93cb55a 100644
--- a/Jenkinsfile.integration
+++ b/Jenkinsfile.integration
@@ -83,7 +83,7 @@ node('jenkins-agent-java11') {
         } finally {
           stage("Tear down environment") {
             sharedLib.notifySlack(currentBuild.result)
-            sleep 1800
+            sleep 600
             sharedLib.teardownEnv(context)
           }
         }

From db18ee077b22d1a79ddc57c08a60d21e32ef27fe Mon Sep 17 00:00:00 2001
From: Mykola Borchuk <it.volu@gmail.com>
Date: Mon, 15 Mar 2021 18:03:12 +0200
Subject: [PATCH 010/153] FOLIO-2982 Added the path to Kafka for
 mod-source-record-storage

---
 shared.groovy | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/shared.groovy b/shared.groovy
index db35a7e..813a85f 100644
--- a/shared.groovy
+++ b/shared.groovy
@@ -549,8 +549,8 @@ def deployMods(mods, okapiIp, modsIp, modsPvtIp, dbPvtIp, tenant, sshCmd, sshUse
         modJob = modJob.replace('8080', '8081')
       }
     }
-    // mod-pubsub has different env variables
-    if (modName.equals("mod-inventory-storage")) {
+    // mod-inventory-storage and mod-source-record-storage have different env variables
+    if (modName.equals("mod-inventory-storage") || modName.equals("mod-source-record-storage")) {
       modJob = readFile("config/mod-inventory-storage.sh").trim()
       modJob = modJob.replace('${dbHost}', dbPvtIp)
       modJob = modJob.replace('${okapiIp}', okapiIp)

From 6d02991a1928f59fcf0fd11c60dfb9485a834f41 Mon Sep 17 00:00:00 2001
From: Mykola Borchuk <it.volu@gmail.com>
Date: Mon, 15 Mar 2021 18:38:15 +0200
Subject: [PATCH 011/153] FOLIO-2982 Changed env files for some mods

---
 Jenkinsfile.integration     |  2 +-
 config/mod-bursar-export.sh |  1 +
 config/mods.sh              |  2 +-
 shared.groovy               | 10 ++++++++--
 4 files changed, 11 insertions(+), 4 deletions(-)
 create mode 100644 config/mod-bursar-export.sh

diff --git a/Jenkinsfile.integration b/Jenkinsfile.integration
index 93cb55a..12a18e2 100644
--- a/Jenkinsfile.integration
+++ b/Jenkinsfile.integration
@@ -83,7 +83,7 @@ node('jenkins-agent-java11') {
         } finally {
           stage("Tear down environment") {
             sharedLib.notifySlack(currentBuild.result)
-            sleep 600
+            sleep 900
             sharedLib.teardownEnv(context)
           }
         }
diff --git a/config/mod-bursar-export.sh b/config/mod-bursar-export.sh
new file mode 100644
index 0000000..7f57b62
--- /dev/null
+++ b/config/mod-bursar-export.sh
@@ -0,0 +1 @@
+docker run -d --rm --name ${modName} --mount type=bind,source=/tmp/folio-conf,target=/folio-conf -e 'JAVA_OPTIONS=-Dorg.folio.metadata.inventory.storage.type=okapi' -e 'DB_HOST=${dbHost}' -e 'DB_PORT=5432' -e 'DB_DATABASE=folio' -e 'DB_USERNAME=folio' -e 'DB_PASSWORD=folioadmin' -p${port}:8081 folioci/${modName}:${modVer} db_connection=/folio-conf/pg.json
\ No newline at end of file
diff --git a/config/mods.sh b/config/mods.sh
index 61f61f7..88c4350 100644
--- a/config/mods.sh
+++ b/config/mods.sh
@@ -1 +1 @@
-docker run -d --name ${modName} --mount type=bind,source=/tmp/folio-conf,target=/folio-conf -e 'JAVA_OPTIONS=-Dorg.folio.metadata.inventory.storage.type=okapi' -p${port}:8081 folioci/${modName}:${modVer} db_connection=/folio-conf/pg.json
+docker run -d --rm --name ${modName} --mount type=bind,source=/tmp/folio-conf,target=/folio-conf -e 'JAVA_OPTIONS=-Dorg.folio.metadata.inventory.storage.type=okapi' -p${port}:8081 folioci/${modName}:${modVer} db_connection=/folio-conf/pg.json
diff --git a/shared.groovy b/shared.groovy
index 813a85f..d350b81 100644
--- a/shared.groovy
+++ b/shared.groovy
@@ -549,12 +549,18 @@ def deployMods(mods, okapiIp, modsIp, modsPvtIp, dbPvtIp, tenant, sshCmd, sshUse
         modJob = modJob.replace('8080', '8081')
       }
     }
-    // mod-inventory-storage and mod-source-record-storage have different env variables
-    if (modName.equals("mod-inventory-storage") || modName.equals("mod-source-record-storage")) {
+    // mod-inventory-storage, mod-source-record-storage and mod-ebsconet have different env variables
+    if (modName.equals("mod-inventory-storage") || modName.equals("mod-source-record-storage") || modName.equals("mod-ebsconet")) {
       modJob = readFile("config/mod-inventory-storage.sh").trim()
       modJob = modJob.replace('${dbHost}', dbPvtIp)
       modJob = modJob.replace('${okapiIp}', okapiIp)
     }
+    // mod-bursar-export has different env variables
+    if (modName.equals("mod-bursar-export")) {
+      modJob = readFile("config/mod-bursar-export.sh").trim()
+      modJob = modJob.replace('${dbHost}', dbPvtIp)
+      modJob = modJob.replace('${okapiIp}', okapiIp)
+    }
     // mod-pubsub has different env variables
     if (modName.equals("mod-pubsub")) {
       modJob = readFile("config/mod-pubsub.sh").trim()

From 54c14652f850eec71940840d3fe77aa475706701 Mon Sep 17 00:00:00 2001
From: Mykola Borchuk <it.volu@gmail.com>
Date: Mon, 15 Mar 2021 19:02:17 +0200
Subject: [PATCH 012/153] FOLIO-2982 Changed env files for some mods

---
 config/mods.sh |  2 +-
 shared.groovy  | 10 ++++++++--
 2 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/config/mods.sh b/config/mods.sh
index 88c4350..61f61f7 100644
--- a/config/mods.sh
+++ b/config/mods.sh
@@ -1 +1 @@
-docker run -d --rm --name ${modName} --mount type=bind,source=/tmp/folio-conf,target=/folio-conf -e 'JAVA_OPTIONS=-Dorg.folio.metadata.inventory.storage.type=okapi' -p${port}:8081 folioci/${modName}:${modVer} db_connection=/folio-conf/pg.json
+docker run -d --name ${modName} --mount type=bind,source=/tmp/folio-conf,target=/folio-conf -e 'JAVA_OPTIONS=-Dorg.folio.metadata.inventory.storage.type=okapi' -p${port}:8081 folioci/${modName}:${modVer} db_connection=/folio-conf/pg.json
diff --git a/shared.groovy b/shared.groovy
index d350b81..3de426e 100644
--- a/shared.groovy
+++ b/shared.groovy
@@ -550,7 +550,10 @@ def deployMods(mods, okapiIp, modsIp, modsPvtIp, dbPvtIp, tenant, sshCmd, sshUse
       }
     }
     // mod-inventory-storage, mod-source-record-storage and mod-ebsconet have different env variables
-    if (modName.equals("mod-inventory-storage") || modName.equals("mod-source-record-storage") || modName.equals("mod-ebsconet")) {
+    if (modName.equals("mod-inventory-storage") || 
+    modName.equals("mod-source-record-storage") || 
+    modName.equals("mod-ebsconet") || 
+    modName.equals("mod-source-record-manager") {
       modJob = readFile("config/mod-inventory-storage.sh").trim()
       modJob = modJob.replace('${dbHost}', dbPvtIp)
       modJob = modJob.replace('${okapiIp}', okapiIp)
@@ -562,7 +565,10 @@ def deployMods(mods, okapiIp, modsIp, modsPvtIp, dbPvtIp, tenant, sshCmd, sshUse
       modJob = modJob.replace('${okapiIp}', okapiIp)
     }
     // mod-pubsub has different env variables
-    if (modName.equals("mod-pubsub")) {
+    if (modName.equals("mod-pubsub") || 
+    modName.equals("mod-ebsconet") || 
+    modName.equals("mod-search") || 
+    modName.equals("mod-quick-marc")) {
       modJob = readFile("config/mod-pubsub.sh").trim()
       modJob = modJob.replace('${dbHost}', dbPvtIp)
       modJob = modJob.replace('${okapiIp}', okapiIp)

From 7b3ea73f6a803ae36b50e29db95c568833f58b16 Mon Sep 17 00:00:00 2001
From: Mykola Borchuk <it.volu@gmail.com>
Date: Mon, 15 Mar 2021 19:08:39 +0200
Subject: [PATCH 013/153] FOLIO-2982 Fixed an issue

---
 shared.groovy | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/shared.groovy b/shared.groovy
index 3de426e..a1c061d 100644
--- a/shared.groovy
+++ b/shared.groovy
@@ -553,7 +553,7 @@ def deployMods(mods, okapiIp, modsIp, modsPvtIp, dbPvtIp, tenant, sshCmd, sshUse
     if (modName.equals("mod-inventory-storage") || 
     modName.equals("mod-source-record-storage") || 
     modName.equals("mod-ebsconet") || 
-    modName.equals("mod-source-record-manager") {
+    modName.equals("mod-source-record-manager")) {
       modJob = readFile("config/mod-inventory-storage.sh").trim()
       modJob = modJob.replace('${dbHost}', dbPvtIp)
       modJob = modJob.replace('${okapiIp}', okapiIp)

From c597c6afd8b1c69864652a70d145dff6cb8d8bd4 Mon Sep 17 00:00:00 2001
From: Mykola Borchuk <it.volu@gmail.com>
Date: Mon, 15 Mar 2021 20:58:44 +0200
Subject: [PATCH 014/153] FOLIO-2982 Fixed anv for mod mod-password-validator

---
 config/mod-bursar-export.sh | 2 +-
 shared.groovy               | 5 +++--
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/config/mod-bursar-export.sh b/config/mod-bursar-export.sh
index 7f57b62..da26faa 100644
--- a/config/mod-bursar-export.sh
+++ b/config/mod-bursar-export.sh
@@ -1 +1 @@
-docker run -d --rm --name ${modName} --mount type=bind,source=/tmp/folio-conf,target=/folio-conf -e 'JAVA_OPTIONS=-Dorg.folio.metadata.inventory.storage.type=okapi' -e 'DB_HOST=${dbHost}' -e 'DB_PORT=5432' -e 'DB_DATABASE=folio' -e 'DB_USERNAME=folio' -e 'DB_PASSWORD=folioadmin' -p${port}:8081 folioci/${modName}:${modVer} db_connection=/folio-conf/pg.json
\ No newline at end of file
+docker run -d --rm --name ${modName} --mount type=bind,source=/tmp/folio-conf,target=/folio-conf -e 'DB_HOST=${dbHost}' -e 'DB_PORT=5432' -e 'DB_DATABASE=folio' -e 'DB_USERNAME=folio' -e 'DB_PASSWORD=folioadmin' -p${port}:8081 folioci/${modName}:${modVer}
\ No newline at end of file
diff --git a/shared.groovy b/shared.groovy
index a1c061d..711a21e 100644
--- a/shared.groovy
+++ b/shared.groovy
@@ -558,8 +558,9 @@ def deployMods(mods, okapiIp, modsIp, modsPvtIp, dbPvtIp, tenant, sshCmd, sshUse
       modJob = modJob.replace('${dbHost}', dbPvtIp)
       modJob = modJob.replace('${okapiIp}', okapiIp)
     }
-    // mod-bursar-export has different env variables
-    if (modName.equals("mod-bursar-export")) {
+    // mod-bursar-export and mod-password-validator have different env variables
+    if (modName.equals("mod-bursar-export") || 
+    modName.equals("mod-password-validator")) {
       modJob = readFile("config/mod-bursar-export.sh").trim()
       modJob = modJob.replace('${dbHost}', dbPvtIp)
       modJob = modJob.replace('${okapiIp}', okapiIp)

From 507e6c323a6c8a2eff40d18f3128bb5f874cf83d Mon Sep 17 00:00:00 2001
From: Mykola Borchuk <it.volu@gmail.com>
Date: Mon, 15 Mar 2021 21:41:11 +0200
Subject: [PATCH 015/153] FOLIO-2982 Fixed env for mod-login

---
 shared.groovy | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/shared.groovy b/shared.groovy
index 711a21e..f2f83ea 100644
--- a/shared.groovy
+++ b/shared.groovy
@@ -560,7 +560,8 @@ def deployMods(mods, okapiIp, modsIp, modsPvtIp, dbPvtIp, tenant, sshCmd, sshUse
     }
     // mod-bursar-export and mod-password-validator have different env variables
     if (modName.equals("mod-bursar-export") || 
-    modName.equals("mod-password-validator")) {
+    modName.equals("mod-password-validator") || 
+    modName.equals("mod-login")) {
       modJob = readFile("config/mod-bursar-export.sh").trim()
       modJob = modJob.replace('${dbHost}', dbPvtIp)
       modJob = modJob.replace('${okapiIp}', okapiIp)

From d79619657e526419086471575da64fec2096c4c2 Mon Sep 17 00:00:00 2001
From: Mykola Borchuk <it.volu@gmail.com>
Date: Mon, 15 Mar 2021 23:10:14 +0200
Subject: [PATCH 016/153] FOLIO-2982 Added elasticsearch container

---
 config/elasticsearch.sh |  1 +
 config/mod-search.sh    |  1 +
 shared.groovy           | 20 ++++++++++++++++++++
 3 files changed, 22 insertions(+)
 create mode 100644 config/elasticsearch.sh
 create mode 100644 config/mod-search.sh

diff --git a/config/elasticsearch.sh b/config/elasticsearch.sh
new file mode 100644
index 0000000..1005bff
--- /dev/null
+++ b/config/elasticsearch.sh
@@ -0,0 +1 @@
+docker run -d --name elasticsearch -p 9200:9200 -p 9300:9300 -e "discovery.type=single-node" -e "ELASTIC_PASSWORD=s3cret" elasticsearch:latest
\ No newline at end of file
diff --git a/config/mod-search.sh b/config/mod-search.sh
new file mode 100644
index 0000000..b021e03
--- /dev/null
+++ b/config/mod-search.sh
@@ -0,0 +1 @@
+docker run -d --rm --name ${modName} -e 'DB_HOST=${dbHost}' -e 'DB_PORT=5432' -e 'DB_DATABASE=folio' -e 'DB_USERNAME=folio' -e 'DB_PASSWORD=folioadmin' -e 'KAFKA_HOST=${dbHost}' -e 'KAFKA_PORT=9092' -e 'ELASTICSEARCH_HOST=${dbHost}' -e 'ELASTICSEARCH_PASSWORD=s3cret' -p${port}:8081 folioci/${modName}:${modVer}
diff --git a/shared.groovy b/shared.groovy
index f2f83ea..8c7d06e 100644
--- a/shared.groovy
+++ b/shared.groovy
@@ -108,6 +108,20 @@ def bootstrapDb(ctx) {
         false
       }
     }
+
+  def elasticJob = readFile("config/elasticsearch.sh").trim()
+  sh "${ctx.sshCmd} -l ${ctx.sshUser} ${ctx.dbIp} ${elasticJob}"
+  def elasticCmd = 'docker ps | grep elasticsearch | wc -l'
+  timeout(10) {
+    waitUntil {
+      try {
+        def rs = sh(script: "${ctx.sshCmd} -l ${ctx.sshUser} ${ctx.dbIp} '${elasticCmd}'", returnStdout: true)
+        rs.toInteger() >= 1
+      } catch (e) {
+        sleep 10
+        false
+      }
+    }
   }
 }
 
@@ -566,6 +580,12 @@ def deployMods(mods, okapiIp, modsIp, modsPvtIp, dbPvtIp, tenant, sshCmd, sshUse
       modJob = modJob.replace('${dbHost}', dbPvtIp)
       modJob = modJob.replace('${okapiIp}', okapiIp)
     }
+    // mod-search has different env variables
+    if (modName.equals("mod-search")) {
+      modJob = readFile("config/mod-search.sh").trim()
+      modJob = modJob.replace('${dbHost}', dbPvtIp)
+      modJob = modJob.replace('${okapiIp}', okapiIp)
+    }
     // mod-pubsub has different env variables
     if (modName.equals("mod-pubsub") || 
     modName.equals("mod-ebsconet") || 

From 8a94e8410f3f5fcf52c2d304f9e3b6f5fb6c013f Mon Sep 17 00:00:00 2001
From: Mykola Borchuk <it.volu@gmail.com>
Date: Mon, 15 Mar 2021 23:13:27 +0200
Subject: [PATCH 017/153] FOLIO-2982 Fixed an issue

---
 shared.groovy | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/shared.groovy b/shared.groovy
index 8c7d06e..1a0d53c 100644
--- a/shared.groovy
+++ b/shared.groovy
@@ -108,7 +108,8 @@ def bootstrapDb(ctx) {
         false
       }
     }
-
+  }
+  
   def elasticJob = readFile("config/elasticsearch.sh").trim()
   sh "${ctx.sshCmd} -l ${ctx.sshUser} ${ctx.dbIp} ${elasticJob}"
   def elasticCmd = 'docker ps | grep elasticsearch | wc -l'

From e9a7ad1c298d358d853bb6bf6d3fd0821b9a16b2 Mon Sep 17 00:00:00 2001
From: Mykola Borchuk <it.volu@gmail.com>
Date: Mon, 15 Mar 2021 23:19:39 +0200
Subject: [PATCH 018/153] FOLIO-2982 Fixed elastic version

---
 config/elasticsearch.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/config/elasticsearch.sh b/config/elasticsearch.sh
index 1005bff..a673228 100644
--- a/config/elasticsearch.sh
+++ b/config/elasticsearch.sh
@@ -1 +1 @@
-docker run -d --name elasticsearch -p 9200:9200 -p 9300:9300 -e "discovery.type=single-node" -e "ELASTIC_PASSWORD=s3cret" elasticsearch:latest
\ No newline at end of file
+docker run -d --name elasticsearch -p 9200:9200 -p 9300:9300 -e "discovery.type=single-node" -e "ELASTIC_PASSWORD=s3cret" elasticsearch:7.10.1
\ No newline at end of file

From 19091566aaac6d18802be2d137d486a9f6f94682 Mon Sep 17 00:00:00 2001
From: Mykola Borchuk <it.volu@gmail.com>
Date: Mon, 15 Mar 2021 23:44:44 +0200
Subject: [PATCH 019/153] FOLIO-2982 Fixed mod-search

---
 shared.groovy | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/shared.groovy b/shared.groovy
index 1a0d53c..ac6e54f 100644
--- a/shared.groovy
+++ b/shared.groovy
@@ -109,7 +109,7 @@ def bootstrapDb(ctx) {
       }
     }
   }
-  
+
   def elasticJob = readFile("config/elasticsearch.sh").trim()
   sh "${ctx.sshCmd} -l ${ctx.sshUser} ${ctx.dbIp} ${elasticJob}"
   def elasticCmd = 'docker ps | grep elasticsearch | wc -l'
@@ -589,8 +589,7 @@ def deployMods(mods, okapiIp, modsIp, modsPvtIp, dbPvtIp, tenant, sshCmd, sshUse
     }
     // mod-pubsub has different env variables
     if (modName.equals("mod-pubsub") || 
-    modName.equals("mod-ebsconet") || 
-    modName.equals("mod-search") || 
+    modName.equals("mod-ebsconet") ||
     modName.equals("mod-quick-marc")) {
       modJob = readFile("config/mod-pubsub.sh").trim()
       modJob = modJob.replace('${dbHost}', dbPvtIp)

From e9a1c45b6df5bcd7ead2a4c1293d283b4b59e270 Mon Sep 17 00:00:00 2001
From: Mykola Borchuk <it.volu@gmail.com>
Date: Tue, 16 Mar 2021 00:44:23 +0200
Subject: [PATCH 020/153] FOLIO-2982 Fixed env for mod-remote-storage

---
 shared.groovy | 1 +
 1 file changed, 1 insertion(+)

diff --git a/shared.groovy b/shared.groovy
index ac6e54f..be45966 100644
--- a/shared.groovy
+++ b/shared.groovy
@@ -590,6 +590,7 @@ def deployMods(mods, okapiIp, modsIp, modsPvtIp, dbPvtIp, tenant, sshCmd, sshUse
     // mod-pubsub has different env variables
     if (modName.equals("mod-pubsub") || 
     modName.equals("mod-ebsconet") ||
+    modName.equals("mod-remote-storage") ||
     modName.equals("mod-quick-marc")) {
       modJob = readFile("config/mod-pubsub.sh").trim()
       modJob = modJob.replace('${dbHost}', dbPvtIp)

From 62a49dde17f8408edc075ed9e27ce5ee9f088168 Mon Sep 17 00:00:00 2001
From: Mykola Borchuk <it.volu@gmail.com>
Date: Tue, 16 Mar 2021 12:33:20 +0200
Subject: [PATCH 021/153] FOLIO-2982 Returned data

---
 Jenkinsfile.integration | 2 +-
 config/mods.sh          | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/Jenkinsfile.integration b/Jenkinsfile.integration
index 12a18e2..ce3add5 100644
--- a/Jenkinsfile.integration
+++ b/Jenkinsfile.integration
@@ -83,7 +83,7 @@ node('jenkins-agent-java11') {
         } finally {
           stage("Tear down environment") {
             sharedLib.notifySlack(currentBuild.result)
-            sleep 900
+            sleep 60
             sharedLib.teardownEnv(context)
           }
         }
diff --git a/config/mods.sh b/config/mods.sh
index 61f61f7..88c4350 100644
--- a/config/mods.sh
+++ b/config/mods.sh
@@ -1 +1 @@
-docker run -d --name ${modName} --mount type=bind,source=/tmp/folio-conf,target=/folio-conf -e 'JAVA_OPTIONS=-Dorg.folio.metadata.inventory.storage.type=okapi' -p${port}:8081 folioci/${modName}:${modVer} db_connection=/folio-conf/pg.json
+docker run -d --rm --name ${modName} --mount type=bind,source=/tmp/folio-conf,target=/folio-conf -e 'JAVA_OPTIONS=-Dorg.folio.metadata.inventory.storage.type=okapi' -p${port}:8081 folioci/${modName}:${modVer} db_connection=/folio-conf/pg.json

From c29f14417a683ab35333980fa41e6d3a5944aec3 Mon Sep 17 00:00:00 2001
From: Mykola Borchuk <it.volu@gmail.com>
Date: Fri, 26 Mar 2021 13:21:33 +0200
Subject: [PATCH 022/153] FOLIO-2982 Fixed OKAPI version

---
 Jenkinsfile.api         | 2 +-
 Jenkinsfile.folioci     | 2 +-
 Jenkinsfile.integration | 2 +-
 Jenkinsfile.platform    | 2 +-
 Jenkinsfile.public      | 2 +-
 5 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/Jenkinsfile.api b/Jenkinsfile.api
index 08e9625..e118360 100644
--- a/Jenkinsfile.api
+++ b/Jenkinsfile.api
@@ -16,7 +16,7 @@ properties([
     string(name: 'AwsUsePublicIp', defaultValue: 'Yes', description: 'AWS EC2 has public IP or not'),
     string(name: 'MdRepo', defaultValue: 'http://folio-registry.aws.indexdata.com', description: 'Module descriptor repository'),
     string(name: 'StableFolio', defaultValue: 'https://folio-snapshot.dev.folio.org', description: 'Use stable version of modules'),
-    string(name: 'FixedOkapi', defaultValue: '4.5.0', description: 'Use specified version of Okapi'),
+    string(name: 'FixedOkapi', defaultValue: 'latest', description: 'Use specified version of Okapi'),
     text(name: 'FixedMods', defaultValue: '', description: 'Paste install.json content here to use predefined module versions rather than pulling from stable FOLIO site'),
     string(name: 'SampleDataRepo', defaultValue: 'https://s3.amazonaws.com/folio-public-sample-data', description: 'Sample data repository'),
     string(name: 'SampleDataName', defaultValue: 'perf', description: 'Sample dataset name'),
diff --git a/Jenkinsfile.folioci b/Jenkinsfile.folioci
index 5bc546b..bc9f664 100644
--- a/Jenkinsfile.folioci
+++ b/Jenkinsfile.folioci
@@ -11,7 +11,7 @@ properties([
     string(name: 'AwsUsePublicIp', defaultValue: 'Yes', description: 'AWS EC2 has public IP or not'),
     string(name: 'MdRepo', defaultValue: 'http://folio-registry.aws.indexdata.com', description: 'Module descriptor repository'),
     string(name: 'StableFolio', defaultValue: 'https://folio-snapshot.dev.folio.org', description: 'Use stable version of modules'),
-    string(name: 'FixedOkapi', defaultValue: '4.5.0', description: 'Use specified version of Okapi'),
+    string(name: 'FixedOkapi', defaultValue: 'latest', description: 'Use specified version of Okapi'),
     text(name: 'FixedMods', defaultValue: '', description: 'Paste install.json content here to use predefined module versions rather than pulling from stable FOLIO site'),
     string(name: 'SampleDataRepo', defaultValue: 'https://s3.amazonaws.com/folio-public-sample-data', description: 'Sample data repository'),
     string(name: 'SampleDataName', defaultValue: 'perf', description: 'Sample dataset name'),
diff --git a/Jenkinsfile.integration b/Jenkinsfile.integration
index ce3add5..237ea63 100644
--- a/Jenkinsfile.integration
+++ b/Jenkinsfile.integration
@@ -16,7 +16,7 @@ properties([
     string(name: 'AwsUsePublicIp', defaultValue: 'Yes', description: 'AWS EC2 has public IP or not'),
     string(name: 'MdRepo', defaultValue: 'http://folio-registry.aws.indexdata.com', description: 'Module descriptor repository'),
     string(name: 'StableFolio', defaultValue: 'https://folio-snapshot.dev.folio.org', description: 'Use stable version of modules'),
-    string(name: 'FixedOkapi', defaultValue: '4.5.0', description: 'Use specified version of Okapi'),
+    string(name: 'FixedOkapi', defaultValue: 'latest', description: 'Use specified version of Okapi'),
     text(name: 'FixedMods', defaultValue: '', description: 'Paste install.json content here to use predefined module versions rather than pulling from stable FOLIO site'),
     string(name: 'SampleDataRepo', defaultValue: 'https://s3.amazonaws.com/folio-public-sample-data', description: 'Sample data repository'),
     string(name: 'SampleDataName', defaultValue: 'perf', description: 'Sample dataset name'),
diff --git a/Jenkinsfile.platform b/Jenkinsfile.platform
index e11f117..b5d4f14 100644
--- a/Jenkinsfile.platform
+++ b/Jenkinsfile.platform
@@ -11,7 +11,7 @@ properties([
     string(name: 'AwsUsePublicIp', defaultValue: 'Yes', description: 'AWS EC2 has public IP or not'),
     string(name: 'MdRepo', defaultValue: 'http://folio-registry.aws.indexdata.com', description: 'Module descriptor repository'),
     string(name: 'StableFolio', defaultValue: 'https://folio-snapshot-core.dev.folio.org', description: 'Use stable version of modules'),
-    string(name: 'FixedOkapi', defaultValue: '4.5.0', description: 'Use specified version of Okapi'),
+    string(name: 'FixedOkapi', defaultValue: 'latest', description: 'Use specified version of Okapi'),
     text(name: 'FixedMods', defaultValue: '', description: 'Paste install.json content here to use predefined module versions rather than pulling from stable FOLIO site'),
     string(name: 'SampleDataRepo', defaultValue: 'https://s3.amazonaws.com/folio-public-sample-data', description: 'Sample data repository'),
     string(name: 'SampleDataName', defaultValue: 'perf', description: 'Sample dataset name'),
diff --git a/Jenkinsfile.public b/Jenkinsfile.public
index a8d714f..06fb32a 100644
--- a/Jenkinsfile.public
+++ b/Jenkinsfile.public
@@ -11,7 +11,7 @@ properties([
     string(name: 'AwsUsePublicIp', defaultValue: 'Yes', description: 'AWS EC2 has public IP or not'),
     string(name: 'MdRepo', defaultValue: 'http://folio-registry.aws.indexdata.com', description: 'Module descriptor repository'),
     string(name: 'StableFolio', defaultValue: 'https://folio-snapshot-stable.dev.folio.org', description: 'Use stable version of modules'),
-    string(name: 'FixedOkapi', defaultValue: '4.5.0', description: 'Use specified version of Okapi'),
+    string(name: 'FixedOkapi', defaultValue: 'latest', description: 'Use specified version of Okapi'),
     text(name: 'FixedMods', defaultValue: '', description: 'Paste install.json content here to use predefined module versions rather than pulling from stable FOLIO site'),
     string(name: 'SampleDataRepo', defaultValue: 'https://s3.amazonaws.com/folio-public-sample-data', description: 'Sample data repository'),
     string(name: 'SampleDataName', defaultValue: 'perf', description: 'Sample dataset name'),

From 05714443d3bd273bad3224885d98f3c785c046a8 Mon Sep 17 00:00:00 2001
From: Mykola Borchuk <it.volu@gmail.com>
Date: Tue, 27 Apr 2021 13:31:53 +0300
Subject: [PATCH 023/153] FOLIO-2982 Fixed OKAPI_URL for mod-search

---
 config/mod-search.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/config/mod-search.sh b/config/mod-search.sh
index b021e03..a8623e3 100644
--- a/config/mod-search.sh
+++ b/config/mod-search.sh
@@ -1 +1 @@
-docker run -d --rm --name ${modName} -e 'DB_HOST=${dbHost}' -e 'DB_PORT=5432' -e 'DB_DATABASE=folio' -e 'DB_USERNAME=folio' -e 'DB_PASSWORD=folioadmin' -e 'KAFKA_HOST=${dbHost}' -e 'KAFKA_PORT=9092' -e 'ELASTICSEARCH_HOST=${dbHost}' -e 'ELASTICSEARCH_PASSWORD=s3cret' -p${port}:8081 folioci/${modName}:${modVer}
+docker run -d --rm --name ${modName} -e 'DB_HOST=${dbHost}' -e 'DB_PORT=5432' -e 'DB_DATABASE=folio' -e 'DB_USERNAME=folio' -e 'DB_PASSWORD=folioadmin' -e 'KAFKA_HOST=${dbHost}' -e 'KAFKA_PORT=9092' -e 'ELASTICSEARCH_HOST=${dbHost}' -e 'ELASTICSEARCH_PASSWORD=s3cret' -e 'OKAPI_URL=http://${okapiIp}:9130' -p${port}:8081 folioci/${modName}:${modVer}

From 484ab59c0f99aacc7f04b7812faa65a988316b28 Mon Sep 17 00:00:00 2001
From: abdenour-drif <78385054+abdenour-drif@users.noreply.github.com>
Date: Thu, 29 Apr 2021 12:36:41 +0300
Subject: [PATCH 024/153] FOLIO-2982 update groovy file

---
 shared.groovy | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/shared.groovy b/shared.groovy
index be45966..11eb1ce 100644
--- a/shared.groovy
+++ b/shared.groovy
@@ -587,6 +587,10 @@ def deployMods(mods, okapiIp, modsIp, modsPvtIp, dbPvtIp, tenant, sshCmd, sshUse
       modJob = modJob.replace('${dbHost}', dbPvtIp)
       modJob = modJob.replace('${okapiIp}', okapiIp)
     }
+    // temporary solution to escape mod-service-interaction failure
+    if (modName.equals("mod-service-interaction")) {
+      modJob = modJob.replace('db_connection=/folio-conf/pg.json','')
+    }
     // mod-pubsub has different env variables
     if (modName.equals("mod-pubsub") || 
     modName.equals("mod-ebsconet") ||

From 48f1f3aca6e2d839d9da4a9e0078a953b42f81dc Mon Sep 17 00:00:00 2001
From: abdenour-drif <78385054+abdenour-drif@users.noreply.github.com>
Date: Thu, 29 Apr 2021 12:43:53 +0300
Subject: [PATCH 025/153] FOLIO-2982 updated maven command for FOLIO-3117

---
 shared.groovy | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/shared.groovy b/shared.groovy
index 11eb1ce..9300802 100644
--- a/shared.groovy
+++ b/shared.groovy
@@ -342,7 +342,7 @@ def runIntegrationTests(ctx) {
     ) {
       def okapiDns = "ec2-" + ctx.okapiIp.replaceAll(/\./, "-") + ".compute-1.amazonaws.com"
       withCredentials([usernamePassword(credentialsId: 'testrail-ut56', passwordVariable: 'testrail_password', usernameVariable: 'testrail_user')]) {
-        sh "mvn test -Dkarate.env=${okapiDns} -DfailIfNoTests=false -Dtestrail_url=${TestRailUrl} -Dtestrail_userId=${testrail_user} -Dtestrail_pwd=${testrail_password} -Dtestrail_projectId=${TestRailProjectId}"
+        sh "mvn clean test -Dkarate.env=${okapiDns} -pl quick-marc -DfailIfNoTests=false -Dtestrail_url=${TestRailUrl} -Dtestrail_userId=${testrail_user} -Dtestrail_pwd=${testrail_password} -Dtestrail_projectId=${TestRailProjectId}"
       }
     }
     sh "mkdir ${env.WORKSPACE}/folio-integration-tests/cucumber-reports"

From a7a56ae9e4b7ac171554a9af79a8c2dfc9aaba6a Mon Sep 17 00:00:00 2001
From: abdenour-drif <78385054+abdenour-drif@users.noreply.github.com>
Date: Thu, 29 Apr 2021 13:00:07 +0300
Subject: [PATCH 026/153] FOLIO-2982 added run script for
 mod-service-interaction

---
 config/mod-service-interaction.sh | 1 +
 1 file changed, 1 insertion(+)
 create mode 100644 config/mod-service-interaction.sh

diff --git a/config/mod-service-interaction.sh b/config/mod-service-interaction.sh
new file mode 100644
index 0000000..ec4c8e1
--- /dev/null
+++ b/config/mod-service-interaction.sh
@@ -0,0 +1 @@
+docker run -d --rm --name ${modName} --mount type=bind,source=/tmp/folio-conf,target=/folio-conf -e 'JAVA_OPTIONS=-Dorg.folio.metadata.inventory.storage.type=okapi' -p${port}:8081 folioci/${modName}:${modVer} 

From bd23f51209e7349496fbea3fc8b1c23a748c440e Mon Sep 17 00:00:00 2001
From: abdenour-drif <78385054+abdenour-drif@users.noreply.github.com>
Date: Thu, 29 Apr 2021 13:06:33 +0300
Subject: [PATCH 027/153] FOLIO-2982 specified docker run sh for
 mod-service-interaction

---
 shared.groovy | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/shared.groovy b/shared.groovy
index 9300802..5fdae67 100644
--- a/shared.groovy
+++ b/shared.groovy
@@ -588,8 +588,11 @@ def deployMods(mods, okapiIp, modsIp, modsPvtIp, dbPvtIp, tenant, sshCmd, sshUse
       modJob = modJob.replace('${okapiIp}', okapiIp)
     }
     // temporary solution to escape mod-service-interaction failure
-    if (modName.equals("mod-service-interaction")) {
-      modJob = modJob.replace('db_connection=/folio-conf/pg.json','')
+   if (modName.equals("mod-service-interaction")) {
+       modJob = readFile("config/mod-service-interaction.sh").trim()
+      // modJob = modJob.replace('${dbHost}', dbPvtIp)
+      // modJob = modJob.replace('${okapiIp}', okapiIp)
+    }
     }
     // mod-pubsub has different env variables
     if (modName.equals("mod-pubsub") || 

From 8a2e5a3843daafc682c9b14be2011331d9985682 Mon Sep 17 00:00:00 2001
From: abdenour-drif <78385054+abdenour-drif@users.noreply.github.com>
Date: Thu, 29 Apr 2021 13:24:28 +0300
Subject: [PATCH 028/153] FOLIO-2982 update mod-service-interaction.sh

---
 config/mod-service-interaction.sh | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/config/mod-service-interaction.sh b/config/mod-service-interaction.sh
index ec4c8e1..133f097 100644
--- a/config/mod-service-interaction.sh
+++ b/config/mod-service-interaction.sh
@@ -1 +1,4 @@
-docker run -d --rm --name ${modName} --mount type=bind,source=/tmp/folio-conf,target=/folio-conf -e 'JAVA_OPTIONS=-Dorg.folio.metadata.inventory.storage.type=okapi' -p${port}:8081 folioci/${modName}:${modVer} 
+docker run -d --rm --name ${modName} --mount type=bind,source=/tmp/folio-conf,target=/folio-conf -e 'JAVA_OPTIONS=-Dorg.folio.metadata.inventory.storage.type=okapi' -p${port}:8081 folioci/${modName}:${modVer}
+docker container exec -it mod-service-interaction  /bin/bash
+db_connection=/folio-conf/pg.json
+exit

From 1c7023a57d02a476df3593ceb96821bf0ec1249b Mon Sep 17 00:00:00 2001
From: abdenour-drif <78385054+abdenour-drif@users.noreply.github.com>
Date: Thu, 29 Apr 2021 13:36:58 +0300
Subject: [PATCH 029/153] FOLIO-2982 fixed syntax error

---
 shared.groovy | 1 -
 1 file changed, 1 deletion(-)

diff --git a/shared.groovy b/shared.groovy
index 5fdae67..3ae4c45 100644
--- a/shared.groovy
+++ b/shared.groovy
@@ -593,7 +593,6 @@ def deployMods(mods, okapiIp, modsIp, modsPvtIp, dbPvtIp, tenant, sshCmd, sshUse
       // modJob = modJob.replace('${dbHost}', dbPvtIp)
       // modJob = modJob.replace('${okapiIp}', okapiIp)
     }
-    }
     // mod-pubsub has different env variables
     if (modName.equals("mod-pubsub") || 
     modName.equals("mod-ebsconet") ||

From f05cc64969547d255f589446c7d52ccb6fdf3873 Mon Sep 17 00:00:00 2001
From: abdenour-drif <78385054+abdenour-drif@users.noreply.github.com>
Date: Thu, 29 Apr 2021 13:49:13 +0300
Subject: [PATCH 030/153] FOLIO-2982 updated mod-service-interaction.sh

---
 config/mod-service-interaction.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/config/mod-service-interaction.sh b/config/mod-service-interaction.sh
index 133f097..2436db1 100644
--- a/config/mod-service-interaction.sh
+++ b/config/mod-service-interaction.sh
@@ -1,4 +1,4 @@
 docker run -d --rm --name ${modName} --mount type=bind,source=/tmp/folio-conf,target=/folio-conf -e 'JAVA_OPTIONS=-Dorg.folio.metadata.inventory.storage.type=okapi' -p${port}:8081 folioci/${modName}:${modVer}
-docker container exec -it mod-service-interaction  /bin/bash
+docker container exec -it ${modName} /bin/bash
 db_connection=/folio-conf/pg.json
 exit

From ddc91f3282aced325064873d45ff280f1e94f48e Mon Sep 17 00:00:00 2001
From: abdenour-drif <78385054+abdenour-drif@users.noreply.github.com>
Date: Thu, 29 Apr 2021 14:10:55 +0300
Subject: [PATCH 031/153] FOLIO-2982 update mod-service-interaction.sh

---
 config/mod-service-interaction.sh | 1 +
 1 file changed, 1 insertion(+)

diff --git a/config/mod-service-interaction.sh b/config/mod-service-interaction.sh
index 2436db1..1091b72 100644
--- a/config/mod-service-interaction.sh
+++ b/config/mod-service-interaction.sh
@@ -1,4 +1,5 @@
 docker run -d --rm --name ${modName} --mount type=bind,source=/tmp/folio-conf,target=/folio-conf -e 'JAVA_OPTIONS=-Dorg.folio.metadata.inventory.storage.type=okapi' -p${port}:8081 folioci/${modName}:${modVer}
+sleep 10
 docker container exec -it ${modName} /bin/bash
 db_connection=/folio-conf/pg.json
 exit

From 13fb9c3ba82ffb4ad2b7b5e2c8acba30cb8043d7 Mon Sep 17 00:00:00 2001
From: abdenour-drif <78385054+abdenour-drif@users.noreply.github.com>
Date: Thu, 29 Apr 2021 14:25:41 +0300
Subject: [PATCH 032/153] FOLIO-2982 updated mod-service-interaction.sh

---
 config/mod-service-interaction.sh | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

diff --git a/config/mod-service-interaction.sh b/config/mod-service-interaction.sh
index 1091b72..c0e38d6 100644
--- a/config/mod-service-interaction.sh
+++ b/config/mod-service-interaction.sh
@@ -1,5 +1,2 @@
-docker run -d --rm --name ${modName} --mount type=bind,source=/tmp/folio-conf,target=/folio-conf -e 'JAVA_OPTIONS=-Dorg.folio.metadata.inventory.storage.type=okapi' -p${port}:8081 folioci/${modName}:${modVer}
-sleep 10
-docker container exec -it ${modName} /bin/bash
-db_connection=/folio-conf/pg.json
-exit
+docker run -d --rm --name ${modName} --mount type=bind,source=/tmp/folio-conf,target=/folio-conf -e 'JAVA_OPTIONS=-Dorg.folio.metadata.inventory.storage.type=okapi' -p${port}:8081 folioci/${modName}:${modVer} && docker container exec -it ${modName} /bin/bash && db_connection=/folio-conf/pg.jso && exit
+

From dda004b47a311d4cca82d7e0162c5a739f1f9cc3 Mon Sep 17 00:00:00 2001
From: abdenour-drif <78385054+abdenour-drif@users.noreply.github.com>
Date: Thu, 29 Apr 2021 14:38:52 +0300
Subject: [PATCH 033/153] FOLIO-2982 update mod-service-interaction.sh

---
 config/mod-service-interaction.sh | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/config/mod-service-interaction.sh b/config/mod-service-interaction.sh
index c0e38d6..b3ecad7 100644
--- a/config/mod-service-interaction.sh
+++ b/config/mod-service-interaction.sh
@@ -1,2 +1,3 @@
-docker run -d --rm --name ${modName} --mount type=bind,source=/tmp/folio-conf,target=/folio-conf -e 'JAVA_OPTIONS=-Dorg.folio.metadata.inventory.storage.type=okapi' -p${port}:8081 folioci/${modName}:${modVer} && docker container exec -it ${modName} /bin/bash && db_connection=/folio-conf/pg.jso && exit
+docker ps
+//docker run -d --rm --name ${modName} --mount type=bind,source=/tmp/folio-conf,target=/folio-conf -e 'JAVA_OPTIONS=-Dorg.folio.metadata.inventory.storage.type=okapi' -p${port}:8081 folioci/${modName}:${modVer} && docker container exec -it ${modName} /bin/bash && db_connection=/folio-conf/pg.jso && exit
 

From 7daf9d4173a5061518b181780bac4bdebc698364 Mon Sep 17 00:00:00 2001
From: abdenour-drif <78385054+abdenour-drif@users.noreply.github.com>
Date: Thu, 29 Apr 2021 14:45:59 +0300
Subject: [PATCH 034/153] Update mod-service-interaction.sh

---
 config/mod-service-interaction.sh | 2 --
 1 file changed, 2 deletions(-)

diff --git a/config/mod-service-interaction.sh b/config/mod-service-interaction.sh
index b3ecad7..171452a 100644
--- a/config/mod-service-interaction.sh
+++ b/config/mod-service-interaction.sh
@@ -1,3 +1 @@
 docker ps
-//docker run -d --rm --name ${modName} --mount type=bind,source=/tmp/folio-conf,target=/folio-conf -e 'JAVA_OPTIONS=-Dorg.folio.metadata.inventory.storage.type=okapi' -p${port}:8081 folioci/${modName}:${modVer} && docker container exec -it ${modName} /bin/bash && db_connection=/folio-conf/pg.jso && exit
-

From 85861bafb3feaced0cce919a633b7b2700c8daa3 Mon Sep 17 00:00:00 2001
From: abdenour-drif <78385054+abdenour-drif@users.noreply.github.com>
Date: Thu, 29 Apr 2021 15:10:54 +0300
Subject: [PATCH 035/153] FOLIO-2982 update script file

---
 config/mod-service-interaction.sh | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/config/mod-service-interaction.sh b/config/mod-service-interaction.sh
index 171452a..99d3c51 100644
--- a/config/mod-service-interaction.sh
+++ b/config/mod-service-interaction.sh
@@ -1 +1,2 @@
-docker ps
+docker run -d --rm --name ${modName} --mount type=bind,source=/tmp/folio-conf,target=/folio-conf -e 'JAVA_OPTIONS=-Dorg.folio.metadata.inventory.storage.type=okapi' -p${port}:8081 folioci/mod-courses:1.2.3-SNAPSHOT.117 db_connection=/folio-conf/pg.json
+

From edb8d04d6f51ed2406c30a689a1c057ee5e58168 Mon Sep 17 00:00:00 2001
From: abdenour-drif <78385054+abdenour-drif@users.noreply.github.com>
Date: Thu, 29 Apr 2021 16:51:03 +0300
Subject: [PATCH 036/153] FOLIO-2983 changed docker image for
 mod-service-interaction

---
 config/mod-service-interaction.sh | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/config/mod-service-interaction.sh b/config/mod-service-interaction.sh
index 99d3c51..510eaff 100644
--- a/config/mod-service-interaction.sh
+++ b/config/mod-service-interaction.sh
@@ -1,2 +1 @@
-docker run -d --rm --name ${modName} --mount type=bind,source=/tmp/folio-conf,target=/folio-conf -e 'JAVA_OPTIONS=-Dorg.folio.metadata.inventory.storage.type=okapi' -p${port}:8081 folioci/mod-courses:1.2.3-SNAPSHOT.117 db_connection=/folio-conf/pg.json
-
+docker run -d --rm --name mod-service-interaction --mount type=bind,source=/tmp/folio-conf,target=/folio-conf -e JAVA_OPTIONS=-Dorg.folio.metadata.inventory.storage.type=okapi -p9230:8081 folioci/mod-service-interaction:1.0.0-SNAPSHOT.21  db_connection=/folio-conf/pg.json

From 4dc08ffbd0ddc80602fcb0758a4e980ff8b6e246 Mon Sep 17 00:00:00 2001
From: abdenour-drif <78385054+abdenour-drif@users.noreply.github.com>
Date: Thu, 29 Apr 2021 17:24:23 +0300
Subject: [PATCH 037/153] Update mod-service-interaction.sh

---
 config/mod-service-interaction.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/config/mod-service-interaction.sh b/config/mod-service-interaction.sh
index 510eaff..cee9424 100644
--- a/config/mod-service-interaction.sh
+++ b/config/mod-service-interaction.sh
@@ -1 +1 @@
-docker run -d --rm --name mod-service-interaction --mount type=bind,source=/tmp/folio-conf,target=/folio-conf -e JAVA_OPTIONS=-Dorg.folio.metadata.inventory.storage.type=okapi -p9230:8081 folioci/mod-service-interaction:1.0.0-SNAPSHOT.21  db_connection=/folio-conf/pg.json
+docker run -d --rm --name ${modName} --mount type=bind,source=/tmp/folio-conf,target=/folio-conf -e 'JAVA_OPTIONS=-Dorg.folio.metadata.inventory.storage.type=okapi' -p${port}:8081 folioci/mod-courses:1.2.3-SNAPSHOT.117 db_connection=/folio-conf/pg.json

From d005e7668ab45a893373983510207ca92884ac91 Mon Sep 17 00:00:00 2001
From: abdenour-drif <78385054+abdenour-drif@users.noreply.github.com>
Date: Thu, 29 Apr 2021 18:38:52 +0300
Subject: [PATCH 038/153] FOLIO-2982 updated maven test command

---
 shared.groovy | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/shared.groovy b/shared.groovy
index 3ae4c45..446ca4f 100644
--- a/shared.groovy
+++ b/shared.groovy
@@ -342,7 +342,7 @@ def runIntegrationTests(ctx) {
     ) {
       def okapiDns = "ec2-" + ctx.okapiIp.replaceAll(/\./, "-") + ".compute-1.amazonaws.com"
       withCredentials([usernamePassword(credentialsId: 'testrail-ut56', passwordVariable: 'testrail_password', usernameVariable: 'testrail_user')]) {
-        sh "mvn clean test -Dkarate.env=${okapiDns} -pl quick-marc -DfailIfNoTests=false -Dtestrail_url=${TestRailUrl} -Dtestrail_userId=${testrail_user} -Dtestrail_pwd=${testrail_password} -Dtestrail_projectId=${TestRailProjectId}"
+        sh "mvn clean test -Dkarate.env=${okapiDns} -DfailIfNoTests=false -Dtestrail_url=${TestRailUrl} -Dtestrail_userId=${testrail_user} -Dtestrail_pwd=${testrail_password} -Dtestrail_projectId=${TestRailProjectId}"
       }
     }
     sh "mkdir ${env.WORKSPACE}/folio-integration-tests/cucumber-reports"

From e5264f74887b0fe9d4b6dbc532f92d0d43ebd673 Mon Sep 17 00:00:00 2001
From: abdenour-drif <78385054+abdenour-drif@users.noreply.github.com>
Date: Thu, 29 Apr 2021 22:05:05 +0300
Subject: [PATCH 039/153] Update shared.groovy

---
 shared.groovy | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/shared.groovy b/shared.groovy
index 446ca4f..a68afd0 100644
--- a/shared.groovy
+++ b/shared.groovy
@@ -342,7 +342,7 @@ def runIntegrationTests(ctx) {
     ) {
       def okapiDns = "ec2-" + ctx.okapiIp.replaceAll(/\./, "-") + ".compute-1.amazonaws.com"
       withCredentials([usernamePassword(credentialsId: 'testrail-ut56', passwordVariable: 'testrail_password', usernameVariable: 'testrail_user')]) {
-        sh "mvn clean test -Dkarate.env=${okapiDns} -DfailIfNoTests=false -Dtestrail_url=${TestRailUrl} -Dtestrail_userId=${testrail_user} -Dtestrail_pwd=${testrail_password} -Dtestrail_projectId=${TestRailProjectId}"
+        sh "mvn test -Dkarate.env=${okapiDns} -DfailIfNoTests=false -Dtestrail_url=${TestRailUrl} -Dtestrail_userId=${testrail_user} -Dtestrail_pwd=${testrail_password} -Dtestrail_projectId=${TestRailProjectId}"
       }
     }
     sh "mkdir ${env.WORKSPACE}/folio-integration-tests/cucumber-reports"

From a940bc029dd17ddffd1b78103b01ce3bdebb670d Mon Sep 17 00:00:00 2001
From: abdenour-drif <78385054+abdenour-drif@users.noreply.github.com>
Date: Thu, 29 Apr 2021 23:14:04 +0300
Subject: [PATCH 040/153] FOLIO-2982 updated groovy file

---
 shared.groovy | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/shared.groovy b/shared.groovy
index a68afd0..daf869e 100644
--- a/shared.groovy
+++ b/shared.groovy
@@ -342,8 +342,7 @@ def runIntegrationTests(ctx) {
     ) {
       def okapiDns = "ec2-" + ctx.okapiIp.replaceAll(/\./, "-") + ".compute-1.amazonaws.com"
       withCredentials([usernamePassword(credentialsId: 'testrail-ut56', passwordVariable: 'testrail_password', usernameVariable: 'testrail_user')]) {
-        sh "mvn test -Dkarate.env=${okapiDns} -DfailIfNoTests=false -Dtestrail_url=${TestRailUrl} -Dtestrail_userId=${testrail_user} -Dtestrail_pwd=${testrail_password} -Dtestrail_projectId=${TestRailProjectId}"
-      }
+      sh "mvn test -Dkarate.env=${okapiDns} -DfailIfNoTests=false -Dtestrail_url=${TestRailUrl} -Dtestrail_userId=${testrail_user} -Dtestrail_pwd=${testrail_password} -Dtestrail_projectId=${TestRailProjectId}"      }
     }
     sh "mkdir ${env.WORKSPACE}/folio-integration-tests/cucumber-reports"
     sh "find . | grep json | grep '/target/surefire-reports/' | xargs -i cp {} ${env.WORKSPACE}/folio-integration-tests/cucumber-reports"

From 20940296569f86870f278b371645159f87aa5036 Mon Sep 17 00:00:00 2001
From: abdenour-drif <78385054+abdenour-drif@users.noreply.github.com>
Date: Mon, 3 May 2021 17:09:07 +0300
Subject: [PATCH 041/153] FOLIO-2982 updated maven test command

---
 shared.groovy | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/shared.groovy b/shared.groovy
index daf869e..a2a3b23 100644
--- a/shared.groovy
+++ b/shared.groovy
@@ -342,7 +342,8 @@ def runIntegrationTests(ctx) {
     ) {
       def okapiDns = "ec2-" + ctx.okapiIp.replaceAll(/\./, "-") + ".compute-1.amazonaws.com"
       withCredentials([usernamePassword(credentialsId: 'testrail-ut56', passwordVariable: 'testrail_password', usernameVariable: 'testrail_user')]) {
-      sh "mvn test -Dkarate.env=${okapiDns} -DfailIfNoTests=false -Dtestrail_url=${TestRailUrl} -Dtestrail_userId=${testrail_user} -Dtestrail_pwd=${testrail_password} -Dtestrail_projectId=${TestRailProjectId}"      }
+      sh "mvn clean test -Dtest=QuickMarcApiTest -pl quick-marc  -DargLine="-Dkarate.env=${okapiDns}" -DfailIfNoTests=false -Dtestrail_url=${TestRailUrl} -Dtestrail_userId=${testrail_user} -Dtestrail_pwd=${testrail_password} -Dtestrail_projectId=${TestRailProjectId}"
+      }
     }
     sh "mkdir ${env.WORKSPACE}/folio-integration-tests/cucumber-reports"
     sh "find . | grep json | grep '/target/surefire-reports/' | xargs -i cp {} ${env.WORKSPACE}/folio-integration-tests/cucumber-reports"

From 748ec6ba96e5f11fd8fd87f5f663c41e2aa77aa5 Mon Sep 17 00:00:00 2001
From: abdenour-drif <78385054+abdenour-drif@users.noreply.github.com>
Date: Wed, 5 May 2021 11:10:00 +0300
Subject: [PATCH 042/153] FOLIO-2982 fixed syntax error

---
 shared.groovy | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/shared.groovy b/shared.groovy
index a2a3b23..092fbaa 100644
--- a/shared.groovy
+++ b/shared.groovy
@@ -342,7 +342,7 @@ def runIntegrationTests(ctx) {
     ) {
       def okapiDns = "ec2-" + ctx.okapiIp.replaceAll(/\./, "-") + ".compute-1.amazonaws.com"
       withCredentials([usernamePassword(credentialsId: 'testrail-ut56', passwordVariable: 'testrail_password', usernameVariable: 'testrail_user')]) {
-      sh "mvn clean test -Dtest=QuickMarcApiTest -pl quick-marc  -DargLine="-Dkarate.env=${okapiDns}" -DfailIfNoTests=false -Dtestrail_url=${TestRailUrl} -Dtestrail_userId=${testrail_user} -Dtestrail_pwd=${testrail_password} -Dtestrail_projectId=${TestRailProjectId}"
+      sh "mvn clean test -Dtest=QuickMarcApiTest -pl quick-marc  -Dkarate.env=${okapiDns} -DfailIfNoTests=false -Dtestrail_url=${TestRailUrl} -Dtestrail_userId=${testrail_user} -Dtestrail_pwd=${testrail_password} -Dtestrail_projectId=${TestRailProjectId}"
       }
     }
     sh "mkdir ${env.WORKSPACE}/folio-integration-tests/cucumber-reports"

From 8b58a5f2f9a4cfeba55de5baf64ab07b5b125681 Mon Sep 17 00:00:00 2001
From: abdenour-drif <78385054+abdenour-drif@users.noreply.github.com>
Date: Wed, 5 May 2021 13:16:31 +0300
Subject: [PATCH 043/153] FOLIO-2982 fixed syntax error

---
 shared.groovy | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/shared.groovy b/shared.groovy
index 092fbaa..1e05cc0 100644
--- a/shared.groovy
+++ b/shared.groovy
@@ -342,7 +342,7 @@ def runIntegrationTests(ctx) {
     ) {
       def okapiDns = "ec2-" + ctx.okapiIp.replaceAll(/\./, "-") + ".compute-1.amazonaws.com"
       withCredentials([usernamePassword(credentialsId: 'testrail-ut56', passwordVariable: 'testrail_password', usernameVariable: 'testrail_user')]) {
-      sh "mvn clean test -Dtest=QuickMarcApiTest -pl quick-marc  -Dkarate.env=${okapiDns} -DfailIfNoTests=false -Dtestrail_url=${TestRailUrl} -Dtestrail_userId=${testrail_user} -Dtestrail_pwd=${testrail_password} -Dtestrail_projectId=${TestRailProjectId}"
+       sh "mvn clean test -Dtest=QuickMarcApiTest -pl quick-marc  -DargLine=\"-Dkarate.env=${okapiDns}\" -DfailIfNoTests=false -Dtestrail_url=${TestRailUrl} -Dtestrail_userId=${testrail_user} -Dtestrail_pwd=${testrail_password} -Dtestrail_projectId=${TestRailProjectId}"
       }
     }
     sh "mkdir ${env.WORKSPACE}/folio-integration-tests/cucumber-reports"

From 218dc25b70b96ac549ef2ce827f4786f06036573 Mon Sep 17 00:00:00 2001
From: abdenour-drif <78385054+abdenour-drif@users.noreply.github.com>
Date: Wed, 5 May 2021 15:13:47 +0300
Subject: [PATCH 044/153] FOLIO-2982 fixed syntax error

---
 shared.groovy | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/shared.groovy b/shared.groovy
index 1e05cc0..c5c9b29 100644
--- a/shared.groovy
+++ b/shared.groovy
@@ -342,7 +342,7 @@ def runIntegrationTests(ctx) {
     ) {
       def okapiDns = "ec2-" + ctx.okapiIp.replaceAll(/\./, "-") + ".compute-1.amazonaws.com"
       withCredentials([usernamePassword(credentialsId: 'testrail-ut56', passwordVariable: 'testrail_password', usernameVariable: 'testrail_user')]) {
-       sh "mvn clean test -Dtest=QuickMarcApiTest -pl quick-marc  -DargLine=\"-Dkarate.env=${okapiDns}\" -DfailIfNoTests=false -Dtestrail_url=${TestRailUrl} -Dtestrail_userId=${testrail_user} -Dtestrail_pwd=${testrail_password} -Dtestrail_projectId=${TestRailProjectId}"
+       sh "mvn test -Dtest=QuickMarcApiTest -pl quick-marc  -DargLine=\"-Dkarate.env=${okapiDns}\" -DfailIfNoTests=false -Dtestrail_url=${TestRailUrl} -Dtestrail_userId=${testrail_user} -Dtestrail_pwd=${testrail_password} -Dtestrail_projectId=${TestRailProjectId}"
       }
     }
     sh "mkdir ${env.WORKSPACE}/folio-integration-tests/cucumber-reports"

From 7ccc5dfccf45e38204d2a18ccf3c45497e0ac6c3 Mon Sep 17 00:00:00 2001
From: abdenour-drif <78385054+abdenour-drif@users.noreply.github.com>
Date: Wed, 5 May 2021 16:18:24 +0300
Subject: [PATCH 045/153] FOLIO-2982 fixed syntax error

---
 shared.groovy | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/shared.groovy b/shared.groovy
index c5c9b29..1fa63b9 100644
--- a/shared.groovy
+++ b/shared.groovy
@@ -342,7 +342,7 @@ def runIntegrationTests(ctx) {
     ) {
       def okapiDns = "ec2-" + ctx.okapiIp.replaceAll(/\./, "-") + ".compute-1.amazonaws.com"
       withCredentials([usernamePassword(credentialsId: 'testrail-ut56', passwordVariable: 'testrail_password', usernameVariable: 'testrail_user')]) {
-       sh "mvn test -Dtest=QuickMarcApiTest -pl quick-marc  -DargLine=\"-Dkarate.env=${okapiDns}\" -DfailIfNoTests=false -Dtestrail_url=${TestRailUrl} -Dtestrail_userId=${testrail_user} -Dtestrail_pwd=${testrail_password} -Dtestrail_projectId=${TestRailProjectId}"
+       sh "mvn test -Dtest=QuickMarcApiTest -DargLine=\"-Dkarate.env=${okapiDns}\" -DfailIfNoTests=false -Dtestrail_url=${TestRailUrl} -Dtestrail_userId=${testrail_user} -Dtestrail_pwd=${testrail_password} -Dtestrail_projectId=${TestRailProjectId}"
       }
     }
     sh "mkdir ${env.WORKSPACE}/folio-integration-tests/cucumber-reports"

From d734065a97477f3e538765b85be9a92e565b777b Mon Sep 17 00:00:00 2001
From: abdenour-drif <78385054+abdenour-drif@users.noreply.github.com>
Date: Thu, 6 May 2021 13:50:36 +0300
Subject: [PATCH 046/153] FOLIO-2982 run all tests

---
 shared.groovy | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/shared.groovy b/shared.groovy
index 1fa63b9..6928b4b 100644
--- a/shared.groovy
+++ b/shared.groovy
@@ -342,7 +342,7 @@ def runIntegrationTests(ctx) {
     ) {
       def okapiDns = "ec2-" + ctx.okapiIp.replaceAll(/\./, "-") + ".compute-1.amazonaws.com"
       withCredentials([usernamePassword(credentialsId: 'testrail-ut56', passwordVariable: 'testrail_password', usernameVariable: 'testrail_user')]) {
-       sh "mvn test -Dtest=QuickMarcApiTest -DargLine=\"-Dkarate.env=${okapiDns}\" -DfailIfNoTests=false -Dtestrail_url=${TestRailUrl} -Dtestrail_userId=${testrail_user} -Dtestrail_pwd=${testrail_password} -Dtestrail_projectId=${TestRailProjectId}"
+      sh "mvn test -Dkarate.env=${okapiDns} -DfailIfNoTests=false -Dtestrail_url=${TestRailUrl} -Dtestrail_userId=${testrail_user} -Dtestrail_pwd=${testrail_password} -Dtestrail_projectId=${TestRailProjectId}"
       }
     }
     sh "mkdir ${env.WORKSPACE}/folio-integration-tests/cucumber-reports"

From d97c141cea78ea2f4fe57ebbfbc5e72060eda768 Mon Sep 17 00:00:00 2001
From: abdenour-drif <78385054+abdenour-drif@users.noreply.github.com>
Date: Mon, 17 May 2021 11:03:10 +0300
Subject: [PATCH 047/153] FOLIO-2982 skipped mod-search

---
 shared.groovy | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/shared.groovy b/shared.groovy
index 6928b4b..3c6810d 100644
--- a/shared.groovy
+++ b/shared.groovy
@@ -443,7 +443,10 @@ def getMods(fixedMods, mdRepo) {
     if (mod.id.startsWith("mod-data-export")) {
       continue
     }
-
+    // skipping mod-search temporarily due to module registartion failure
+    if (mod.id.startsWith("mod-search")) {
+      continue
+    }
     def group = (mod.id =~ /(^\D+)-(\d+.*$)/)
     def modName = group[0][1]
     // only select backend (mod-) and frontend (folio-) modules

From e0364edbcb473b5bd121650cc874022e63dcca3f Mon Sep 17 00:00:00 2001
From: abdenour-drif <78385054+abdenour-drif@users.noreply.github.com>
Date: Wed, 2 Jun 2021 16:29:49 +0300
Subject: [PATCH 048/153] FOLIO-2982 added mod-data-export

---
 shared.groovy | 18 ++++++++++++++----
 1 file changed, 14 insertions(+), 4 deletions(-)

diff --git a/shared.groovy b/shared.groovy
index 3c6810d..72f2f30 100644
--- a/shared.groovy
+++ b/shared.groovy
@@ -440,13 +440,22 @@ def getMods(fixedMods, mdRepo) {
 
     // registering in Okapi issue
     // should be fixed later
-    if (mod.id.startsWith("mod-data-export")) {
+    if (mod.id.startsWith("mod-data-export-spring")) {
+      continue
+    }
+	
+	if (mod.id.startsWith("mod-data-export-worker")) {
       continue
     }
     // skipping mod-search temporarily due to module registartion failure
     if (mod.id.startsWith("mod-search")) {
       continue
     }
+	
+	if (mod.id.startsWith("mod-service-interaction")) {
+      continue
+    }
+	
     def group = (mod.id =~ /(^\D+)-(\d+.*$)/)
     def modName = group[0][1]
     // only select backend (mod-) and frontend (folio-) modules
@@ -591,11 +600,12 @@ def deployMods(mods, okapiIp, modsIp, modsPvtIp, dbPvtIp, tenant, sshCmd, sshUse
       modJob = modJob.replace('${okapiIp}', okapiIp)
     }
     // temporary solution to escape mod-service-interaction failure
-   if (modName.equals("mod-service-interaction")) {
-       modJob = readFile("config/mod-service-interaction.sh").trim()
+   //if (modName.equals("mod-service-interaction")) {
+    //  continue 
+      // modJob = readFile("config/mod-service-interaction.sh").trim()
       // modJob = modJob.replace('${dbHost}', dbPvtIp)
       // modJob = modJob.replace('${okapiIp}', okapiIp)
-    }
+   // }
     // mod-pubsub has different env variables
     if (modName.equals("mod-pubsub") || 
     modName.equals("mod-ebsconet") ||

From d3f887d478206117042dbadcde45d4cb0a644723 Mon Sep 17 00:00:00 2001
From: abdenour-drif <78385054+abdenour-drif@users.noreply.github.com>
Date: Tue, 8 Jun 2021 17:38:18 +0300
Subject: [PATCH 049/153] FOLIO-2982 added run script for mod-data-export

---
 config/mod-data-export.sh | 1 +
 1 file changed, 1 insertion(+)
 create mode 100644 config/mod-data-export.sh

diff --git a/config/mod-data-export.sh b/config/mod-data-export.sh
new file mode 100644
index 0000000..917f32e
--- /dev/null
+++ b/config/mod-data-export.sh
@@ -0,0 +1 @@
+docker run -d --rm --name ${modName} --mount type=bind,source=/tmp/folio-conf,target=/folio-conf -e 'JAVA_OPTIONS=-Daws.region=us-west-2 -Daws.accessKeyId=$(DATA-EXPORT-AWS_ACCESS_KEY_ID) -Daws.secretKey=$(DATA-EXPORT-AWS_SECRET_ACCESS_KEY) -Dbucket.name=folio-concorde -Dorg.folio.metadata.inventory.storage.type=okapi' -p${port}:8081 folioci/${modName}:${modVer} db_connection=/folio-conf/pg.json

From 386af51c4c5c7d5d24a705bcd59b4f465d757c42 Mon Sep 17 00:00:00 2001
From: abdenour-drif <78385054+abdenour-drif@users.noreply.github.com>
Date: Tue, 8 Jun 2021 18:21:25 +0300
Subject: [PATCH 050/153] FOLIO-2982 updated mod-data-export-sh

---
 config/mod-data-export.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/config/mod-data-export.sh b/config/mod-data-export.sh
index 917f32e..f3627e1 100644
--- a/config/mod-data-export.sh
+++ b/config/mod-data-export.sh
@@ -1 +1 @@
-docker run -d --rm --name ${modName} --mount type=bind,source=/tmp/folio-conf,target=/folio-conf -e 'JAVA_OPTIONS=-Daws.region=us-west-2 -Daws.accessKeyId=$(DATA-EXPORT-AWS_ACCESS_KEY_ID) -Daws.secretKey=$(DATA-EXPORT-AWS_SECRET_ACCESS_KEY) -Dbucket.name=folio-concorde -Dorg.folio.metadata.inventory.storage.type=okapi' -p${port}:8081 folioci/${modName}:${modVer} db_connection=/folio-conf/pg.json
+docker run -d --rm --name ${modName} --mount type=bind,source=/tmp/folio-conf,target=/folio-conf -e 'JAVA_OPTIONS=-Daws.region=us-west-2 -Daws.accessKeyId=${DATA-EXPORT-AWS_ACCESS_KEY_ID} -Daws.secretKey=${DATA-EXPORT-AWS_SECRET_ACCESS_KEY} -Dbucket.name=folio-concorde -Dorg.folio.metadata.inventory.storage.type=okapi' -p${port}:8081 folioci/${modName}:${modVer} db_connection=/folio-conf/pg.json

From 06867e98b5812a67d97998181774a4d4657b6bac Mon Sep 17 00:00:00 2001
From: abdenour-drif <78385054+abdenour-drif@users.noreply.github.com>
Date: Tue, 8 Jun 2021 18:37:18 +0300
Subject: [PATCH 051/153] FOLIO-2982 fixed env var error

---
 config/mod-data-export.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/config/mod-data-export.sh b/config/mod-data-export.sh
index f3627e1..b4138a8 100644
--- a/config/mod-data-export.sh
+++ b/config/mod-data-export.sh
@@ -1 +1 @@
-docker run -d --rm --name ${modName} --mount type=bind,source=/tmp/folio-conf,target=/folio-conf -e 'JAVA_OPTIONS=-Daws.region=us-west-2 -Daws.accessKeyId=${DATA-EXPORT-AWS_ACCESS_KEY_ID} -Daws.secretKey=${DATA-EXPORT-AWS_SECRET_ACCESS_KEY} -Dbucket.name=folio-concorde -Dorg.folio.metadata.inventory.storage.type=okapi' -p${port}:8081 folioci/${modName}:${modVer} db_connection=/folio-conf/pg.json
+docker run -d --rm --name ${modName} --mount type=bind,source=/tmp/folio-conf,target=/folio-conf -e 'JAVA_OPTIONS=-Daws.region=us-west-2 -Daws.accessKeyId=$DATA-EXPORT-AWS_ACCESS_KEY -Daws.secretKey=$DATA-EXPORT-AWS_SECRET_ACCESS_KEY -Dbucket.name=folio-concorde -Dorg.folio.metadata.inventory.storage.type=okapi' -p${port}:8081 folioci/${modName}:${modVer} db_connection=/folio-conf/pg.json

From a7d60253f93c816aa1eaf1157081c2f412bb256c Mon Sep 17 00:00:00 2001
From: abdenour-drif <78385054+abdenour-drif@users.noreply.github.com>
Date: Tue, 8 Jun 2021 18:53:03 +0300
Subject: [PATCH 052/153] FOLIO-2982 fixed syntax error

---
 config/mod-data-export.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/config/mod-data-export.sh b/config/mod-data-export.sh
index b4138a8..33502e3 100644
--- a/config/mod-data-export.sh
+++ b/config/mod-data-export.sh
@@ -1 +1 @@
-docker run -d --rm --name ${modName} --mount type=bind,source=/tmp/folio-conf,target=/folio-conf -e 'JAVA_OPTIONS=-Daws.region=us-west-2 -Daws.accessKeyId=$DATA-EXPORT-AWS_ACCESS_KEY -Daws.secretKey=$DATA-EXPORT-AWS_SECRET_ACCESS_KEY -Dbucket.name=folio-concorde -Dorg.folio.metadata.inventory.storage.type=okapi' -p${port}:8081 folioci/${modName}:${modVer} db_connection=/folio-conf/pg.json
+docker run -d --rm --name ${modName} --mount type=bind,source=/tmp/folio-conf,target=/folio-conf -e 'JAVA_OPTIONS=-Daws.region=us-west-2 -Daws.accessKeyId=\$DATA-EXPORT-AWS_ACCESS_KEY -Daws.secretKey=\$DATA-EXPORT-AWS_SECRET_ACCESS_KEY -Dbucket.name=folio-concorde -Dorg.folio.metadata.inventory.storage.type=okapi' -p${port}:8081 folioci/${modName}:${modVer} db_connection=/folio-conf/pg.json

From 404ceb00736045cb359ba8d04d4cbeeb0390da4b Mon Sep 17 00:00:00 2001
From: abdenour-drif <78385054+abdenour-drif@users.noreply.github.com>
Date: Wed, 9 Jun 2021 10:04:44 +0300
Subject: [PATCH 053/153] FOLIO-2982 updated shared-groovy file

---
 config/mod-data-export.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/config/mod-data-export.sh b/config/mod-data-export.sh
index 33502e3..ce02bfc 100644
--- a/config/mod-data-export.sh
+++ b/config/mod-data-export.sh
@@ -1 +1 @@
-docker run -d --rm --name ${modName} --mount type=bind,source=/tmp/folio-conf,target=/folio-conf -e 'JAVA_OPTIONS=-Daws.region=us-west-2 -Daws.accessKeyId=\$DATA-EXPORT-AWS_ACCESS_KEY -Daws.secretKey=\$DATA-EXPORT-AWS_SECRET_ACCESS_KEY -Dbucket.name=folio-concorde -Dorg.folio.metadata.inventory.storage.type=okapi' -p${port}:8081 folioci/${modName}:${modVer} db_connection=/folio-conf/pg.json
+docker run -d --rm --name ${modName} --mount type=bind,source=/tmp/folio-conf,target=/folio-conf -e 'JAVA_OPTIONS=-Daws.region=us-west-2 -Daws.accessKeyId=$$DATA-EXPORT-AWS_ACCESS_KEY -Daws.secretKey=$$DATA-EXPORT-AWS_SECRET_ACCESS_KEY -Dbucket.name=folio-concorde -Dorg.folio.metadata.inventory.storage.type=okapi' -p${port}:8081 folioci/${modName}:${modVer} db_connection=/folio-conf/pg.json

From daf581b6ca4e8a6c4dcd7c65077eead87df4b92e Mon Sep 17 00:00:00 2001
From: abdenour-drif <78385054+abdenour-drif@users.noreply.github.com>
Date: Wed, 9 Jun 2021 11:34:39 +0300
Subject: [PATCH 054/153] Update mod-data-export.sh

---
 config/mod-data-export.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/config/mod-data-export.sh b/config/mod-data-export.sh
index ce02bfc..e351ddf 100644
--- a/config/mod-data-export.sh
+++ b/config/mod-data-export.sh
@@ -1 +1 @@
-docker run -d --rm --name ${modName} --mount type=bind,source=/tmp/folio-conf,target=/folio-conf -e 'JAVA_OPTIONS=-Daws.region=us-west-2 -Daws.accessKeyId=$$DATA-EXPORT-AWS_ACCESS_KEY -Daws.secretKey=$$DATA-EXPORT-AWS_SECRET_ACCESS_KEY -Dbucket.name=folio-concorde -Dorg.folio.metadata.inventory.storage.type=okapi' -p${port}:8081 folioci/${modName}:${modVer} db_connection=/folio-conf/pg.json
+docker run -d --rm --name ${modName} --mount type=bind,source=/tmp/folio-conf,target=/folio-conf -e 'JAVA_OPTIONS=-Daws.region=us-west-2 -Daws.accessKeyId=${DATA-EXPORT-AWS_ACCESS_KEY} -Daws.secretKey=${DATA-EXPORT-AWS_SECRET_ACCESS_KEY} -Dbucket.name=folio-concorde -Dorg.folio.metadata.inventory.storage.type=okapi' -p${port}:8081 folioci/${modName}:${modVer} db_connection=/folio-conf/pg.json

From b95c401f460c216a0aa077398e08b6f32377f75f Mon Sep 17 00:00:00 2001
From: abdenour-drif <78385054+abdenour-drif@users.noreply.github.com>
Date: Wed, 9 Jun 2021 12:03:13 +0300
Subject: [PATCH 055/153] FOLIO-2982 changed s3 credentials for mod-data-export

---
 config/mod-data-export.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/config/mod-data-export.sh b/config/mod-data-export.sh
index e351ddf..0baa23f 100644
--- a/config/mod-data-export.sh
+++ b/config/mod-data-export.sh
@@ -1 +1 @@
-docker run -d --rm --name ${modName} --mount type=bind,source=/tmp/folio-conf,target=/folio-conf -e 'JAVA_OPTIONS=-Daws.region=us-west-2 -Daws.accessKeyId=${DATA-EXPORT-AWS_ACCESS_KEY} -Daws.secretKey=${DATA-EXPORT-AWS_SECRET_ACCESS_KEY} -Dbucket.name=folio-concorde -Dorg.folio.metadata.inventory.storage.type=okapi' -p${port}:8081 folioci/${modName}:${modVer} db_connection=/folio-conf/pg.json
+docker run -d --rm --name ${modName} --mount type=bind,source=/tmp/folio-conf,target=/folio-conf -e 'JAVA_OPTIONS=-Daws.region=us-west-2 -Daws.accessKeyId=${s3-access} -Daws.secretKey=${s3-secret} -Dbucket.name=folio-concorde -Dorg.folio.metadata.inventory.storage.type=okapi' -p${port}:8081 folioci/${modName}:${modVer} db_connection=/folio-conf/pg.json

From 5d767cef40f73a037121aa0bc056db74455f72f3 Mon Sep 17 00:00:00 2001
From: abdenour-drif <78385054+abdenour-drif@users.noreply.github.com>
Date: Wed, 9 Jun 2021 12:18:36 +0300
Subject: [PATCH 056/153] FOLIO-2982 update mod-data-export.sh

---
 config/mod-data-export.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/config/mod-data-export.sh b/config/mod-data-export.sh
index 0baa23f..895719e 100644
--- a/config/mod-data-export.sh
+++ b/config/mod-data-export.sh
@@ -1 +1 @@
-docker run -d --rm --name ${modName} --mount type=bind,source=/tmp/folio-conf,target=/folio-conf -e 'JAVA_OPTIONS=-Daws.region=us-west-2 -Daws.accessKeyId=${s3-access} -Daws.secretKey=${s3-secret} -Dbucket.name=folio-concorde -Dorg.folio.metadata.inventory.storage.type=okapi' -p${port}:8081 folioci/${modName}:${modVer} db_connection=/folio-conf/pg.json
+docker run -d --rm --name ${modName} --mount type=bind,source=/tmp/folio-conf,target=/folio-conf -e 'JAVA_OPTIONS=-Daws.region=us-west-2 -Daws.accessKeyId=s3-access -Daws.secretKey=s3-secret -Dbucket.name=folio-concorde -Dorg.folio.metadata.inventory.storage.type=okapi' -p${port}:8081 folioci/${modName}:${modVer} db_connection=/folio-conf/pg.json

From bcd10aebb41fb3dda512ff502a48cecdeaff5b84 Mon Sep 17 00:00:00 2001
From: abdenour-drif <78385054+abdenour-drif@users.noreply.github.com>
Date: Wed, 9 Jun 2021 16:38:14 +0300
Subject: [PATCH 057/153] FOLIO-2982 changed elasticsearch image

---
 config/elasticsearch.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/config/elasticsearch.sh b/config/elasticsearch.sh
index a673228..1982404 100644
--- a/config/elasticsearch.sh
+++ b/config/elasticsearch.sh
@@ -1 +1 @@
-docker run -d --name elasticsearch -p 9200:9200 -p 9300:9300 -e "discovery.type=single-node" -e "ELASTIC_PASSWORD=s3cret" elasticsearch:7.10.1
\ No newline at end of file
+docker run -d --name elasticsearch -p 9200:9200 -p 9300:9300 -e "discovery.type=single-node" -e "ELASTIC_PASSWORD=s3cret" docker.dev.folio.org/folio-elasticsearch:7.10.1

From 424dc694568adfdb4d80fd23a9d727f51738c8e7 Mon Sep 17 00:00:00 2001
From: abdenour-drif <78385054+abdenour-drif@users.noreply.github.com>
Date: Wed, 9 Jun 2021 16:56:49 +0300
Subject: [PATCH 058/153] FOLIO-2982 removed the mod-search skip step

---
 shared.groovy | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/shared.groovy b/shared.groovy
index 72f2f30..e79ca53 100644
--- a/shared.groovy
+++ b/shared.groovy
@@ -447,11 +447,7 @@ def getMods(fixedMods, mdRepo) {
 	if (mod.id.startsWith("mod-data-export-worker")) {
       continue
     }
-    // skipping mod-search temporarily due to module registartion failure
-    if (mod.id.startsWith("mod-search")) {
-      continue
-    }
-	
+    
 	if (mod.id.startsWith("mod-service-interaction")) {
       continue
     }

From e4d61501fa040d8e278b095f04998160f1c4a74c Mon Sep 17 00:00:00 2001
From: abdenour-drif <78385054+abdenour-drif@users.noreply.github.com>
Date: Thu, 10 Jun 2021 11:16:30 +0300
Subject: [PATCH 059/153] FOLIO-2982 updated mod-data-export.sh

---
 config/mod-data-export.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/config/mod-data-export.sh b/config/mod-data-export.sh
index 895719e..e68826e 100644
--- a/config/mod-data-export.sh
+++ b/config/mod-data-export.sh
@@ -1 +1 @@
-docker run -d --rm --name ${modName} --mount type=bind,source=/tmp/folio-conf,target=/folio-conf -e 'JAVA_OPTIONS=-Daws.region=us-west-2 -Daws.accessKeyId=s3-access -Daws.secretKey=s3-secret -Dbucket.name=folio-concorde -Dorg.folio.metadata.inventory.storage.type=okapi' -p${port}:8081 folioci/${modName}:${modVer} db_connection=/folio-conf/pg.json
+docker run -d --rm --name ${modName} --mount type=bind,source=/tmp/folio-conf,target=/folio-conf -e 'JAVA_OPTIONS=-Daws.region=us-west-2 -Daws.accessKeyId=$s3-access -Daws.secretKey=$s3-secret -Dbucket.name=folio-concorde -Dorg.folio.metadata.inventory.storage.type=okapi' -p${port}:8081 folioci/${modName}:${modVer} db_connection=/folio-conf/pg.json

From 6661d1fe91d7e4849ff9a8371a719c743a28d82f Mon Sep 17 00:00:00 2001
From: abdenour-drif <78385054+abdenour-drif@users.noreply.github.com>
Date: Thu, 10 Jun 2021 12:11:07 +0300
Subject: [PATCH 060/153] FOLIO-2982 updated mod-data-export.sh

---
 config/mod-data-export.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/config/mod-data-export.sh b/config/mod-data-export.sh
index e68826e..0baa23f 100644
--- a/config/mod-data-export.sh
+++ b/config/mod-data-export.sh
@@ -1 +1 @@
-docker run -d --rm --name ${modName} --mount type=bind,source=/tmp/folio-conf,target=/folio-conf -e 'JAVA_OPTIONS=-Daws.region=us-west-2 -Daws.accessKeyId=$s3-access -Daws.secretKey=$s3-secret -Dbucket.name=folio-concorde -Dorg.folio.metadata.inventory.storage.type=okapi' -p${port}:8081 folioci/${modName}:${modVer} db_connection=/folio-conf/pg.json
+docker run -d --rm --name ${modName} --mount type=bind,source=/tmp/folio-conf,target=/folio-conf -e 'JAVA_OPTIONS=-Daws.region=us-west-2 -Daws.accessKeyId=${s3-access} -Daws.secretKey=${s3-secret} -Dbucket.name=folio-concorde -Dorg.folio.metadata.inventory.storage.type=okapi' -p${port}:8081 folioci/${modName}:${modVer} db_connection=/folio-conf/pg.json

From 8e8baa988bfeac2f4dbdf40a206ab80daaff84e8 Mon Sep 17 00:00:00 2001
From: abdenour-drif <78385054+abdenour-drif@users.noreply.github.com>
Date: Fri, 11 Jun 2021 11:57:49 +0300
Subject: [PATCH 061/153] FOLIO-2982 updated mod-data-export.sh

---
 config/mod-data-export.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/config/mod-data-export.sh b/config/mod-data-export.sh
index 0baa23f..9883c90 100644
--- a/config/mod-data-export.sh
+++ b/config/mod-data-export.sh
@@ -1 +1 @@
-docker run -d --rm --name ${modName} --mount type=bind,source=/tmp/folio-conf,target=/folio-conf -e 'JAVA_OPTIONS=-Daws.region=us-west-2 -Daws.accessKeyId=${s3-access} -Daws.secretKey=${s3-secret} -Dbucket.name=folio-concorde -Dorg.folio.metadata.inventory.storage.type=okapi' -p${port}:8081 folioci/${modName}:${modVer} db_connection=/folio-conf/pg.json
+docker run -d --rm --name ${modName} --mount type=bind,source=/tmp/folio-conf,target=/folio-conf -e 'JAVA_OPTIONS=-Daws.region=us-west-2 -Daws.accessKeyId=${AWS_ACCESS_KEY_ID} -Daws.secretKey=${AWS_SECRET_ACCESS_KEY} -Dbucket.name=folio-concorde -Dorg.folio.metadata.inventory.storage.type=okapi' -p${port}:8081 folioci/${modName}:${modVer} db_connection=/folio-conf/pg.json

From f5be81b3af888e33330d5b9433865c60b7721cbb Mon Sep 17 00:00:00 2001
From: abdenour-drif <78385054+abdenour-drif@users.noreply.github.com>
Date: Fri, 11 Jun 2021 12:33:35 +0300
Subject: [PATCH 062/153] FOLIO-2982 updated mod-data-export.sh

---
 config/mod-data-export.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/config/mod-data-export.sh b/config/mod-data-export.sh
index 9883c90..3d1f328 100644
--- a/config/mod-data-export.sh
+++ b/config/mod-data-export.sh
@@ -1 +1 @@
-docker run -d --rm --name ${modName} --mount type=bind,source=/tmp/folio-conf,target=/folio-conf -e 'JAVA_OPTIONS=-Daws.region=us-west-2 -Daws.accessKeyId=${AWS_ACCESS_KEY_ID} -Daws.secretKey=${AWS_SECRET_ACCESS_KEY} -Dbucket.name=folio-concorde -Dorg.folio.metadata.inventory.storage.type=okapi' -p${port}:8081 folioci/${modName}:${modVer} db_connection=/folio-conf/pg.json
+docker run -d --rm --name ${modName} --mount type=bind,source=/tmp/folio-conf,target=/folio-conf -e 'JAVA_OPTIONS=-Dorg.folio.metadata.inventory.storage.type=okapi -Daws.region=us-west-2 -Daws.accessKeyId=${AWS_ACCESS_KEY_ID} -Daws.secretKey=${AWS_SECRET_ACCESS_KEY} -Dbucket.name=folio-concorde' -p${port}:8081 folioci/${modName}:${modVer} db_connection=/folio-conf/pg.json

From f5dd9d7d69bb260eaed5967ecf07fb1ac5961a81 Mon Sep 17 00:00:00 2001
From: abdenour-drif <78385054+abdenour-drif@users.noreply.github.com>
Date: Fri, 11 Jun 2021 12:47:06 +0300
Subject: [PATCH 063/153] FOLIO-2982 updated mod-data-export.sh

---
 config/mod-data-export.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/config/mod-data-export.sh b/config/mod-data-export.sh
index 3d1f328..32d7733 100644
--- a/config/mod-data-export.sh
+++ b/config/mod-data-export.sh
@@ -1 +1 @@
-docker run -d --rm --name ${modName} --mount type=bind,source=/tmp/folio-conf,target=/folio-conf -e 'JAVA_OPTIONS=-Dorg.folio.metadata.inventory.storage.type=okapi -Daws.region=us-west-2 -Daws.accessKeyId=${AWS_ACCESS_KEY_ID} -Daws.secretKey=${AWS_SECRET_ACCESS_KEY} -Dbucket.name=folio-concorde' -p${port}:8081 folioci/${modName}:${modVer} db_connection=/folio-conf/pg.json
+docker run -d --rm --name ${modName} --mount type=bind,source=/tmp/folio-conf,target=/folio-conf -e "JAVA_OPTIONS=-Dorg.folio.metadata.inventory.storage.type=okapi -Daws.region=us-west-2 -Daws.accessKeyId=${AWS_ACCESS_KEY_ID} -Daws.secretKey=${AWS_SECRET_ACCESS_KEY} -Dbucket.name=folio-concorde" -p${port}:8081 folioci/${modName}:${modVer} db_connection=/folio-conf/pg.json

From f0fec0bbb5092143a8a3f20f0a607e49996461c2 Mon Sep 17 00:00:00 2001
From: abdenour-drif <78385054+abdenour-drif@users.noreply.github.com>
Date: Fri, 11 Jun 2021 12:59:39 +0300
Subject: [PATCH 064/153] FOLIO-2982 updated mod-data-export.sh

---
 config/mod-data-export.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/config/mod-data-export.sh b/config/mod-data-export.sh
index 32d7733..1d9fc12 100644
--- a/config/mod-data-export.sh
+++ b/config/mod-data-export.sh
@@ -1 +1 @@
-docker run -d --rm --name ${modName} --mount type=bind,source=/tmp/folio-conf,target=/folio-conf -e "JAVA_OPTIONS=-Dorg.folio.metadata.inventory.storage.type=okapi -Daws.region=us-west-2 -Daws.accessKeyId=${AWS_ACCESS_KEY_ID} -Daws.secretKey=${AWS_SECRET_ACCESS_KEY} -Dbucket.name=folio-concorde" -p${port}:8081 folioci/${modName}:${modVer} db_connection=/folio-conf/pg.json
+docker run -d --rm --name ${modName} --mount type=bind,source=/tmp/folio-conf,target=/folio-conf -e "JAVA_TOOL_OPTIONS=-Dorg.folio.metadata.inventory.storage.type=okapi -Daws.region=us-west-2 -Daws.accessKeyId=${AWS_ACCESS_KEY_ID} -Daws.secretKey=${AWS_SECRET_ACCESS_KEY} -Dbucket.name=folio-concorde" -p${port}:8081 folioci/${modName}:${modVer} db_connection=/folio-conf/pg.json

From c2950779c147b881d9cfb23be229793d549a3722 Mon Sep 17 00:00:00 2001
From: abdenour-drif <78385054+abdenour-drif@users.noreply.github.com>
Date: Fri, 11 Jun 2021 13:06:22 +0300
Subject: [PATCH 065/153] FOLIO-2982 updated mod-data-export

---
 config/mod-data-export.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/config/mod-data-export.sh b/config/mod-data-export.sh
index 1d9fc12..7935000 100644
--- a/config/mod-data-export.sh
+++ b/config/mod-data-export.sh
@@ -1 +1 @@
-docker run -d --rm --name ${modName} --mount type=bind,source=/tmp/folio-conf,target=/folio-conf -e "JAVA_TOOL_OPTIONS=-Dorg.folio.metadata.inventory.storage.type=okapi -Daws.region=us-west-2 -Daws.accessKeyId=${AWS_ACCESS_KEY_ID} -Daws.secretKey=${AWS_SECRET_ACCESS_KEY} -Dbucket.name=folio-concorde" -p${port}:8081 folioci/${modName}:${modVer} db_connection=/folio-conf/pg.json
+docker run -d --rm --name ${modName} --mount type=bind,source=/tmp/folio-conf,target=/folio-conf -e 'JAVA_TOOL_OPTIONS=-Dorg.folio.metadata.inventory.storage.type=okapi -Daws.region=us-west-2 -Daws.accessKeyId=${AWS_ACCESS_KEY_ID} -Daws.secretKey=${AWS_SECRET_ACCESS_KEY} -Dbucket.name=folio-concorde' -p${port}:8081 folioci/${modName}:${modVer} db_connection=/folio-conf/pg.json

From ed21941f2b0df78718567c9ae4ce7e04a6cd42e7 Mon Sep 17 00:00:00 2001
From: abdenour-drif <78385054+abdenour-drif@users.noreply.github.com>
Date: Fri, 11 Jun 2021 13:13:06 +0300
Subject: [PATCH 066/153] FOLIO-2982 updated mod-data-export.sh

---
 config/mod-data-export.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/config/mod-data-export.sh b/config/mod-data-export.sh
index 7935000..0136de2 100644
--- a/config/mod-data-export.sh
+++ b/config/mod-data-export.sh
@@ -1 +1 @@
-docker run -d --rm --name ${modName} --mount type=bind,source=/tmp/folio-conf,target=/folio-conf -e 'JAVA_TOOL_OPTIONS=-Dorg.folio.metadata.inventory.storage.type=okapi -Daws.region=us-west-2 -Daws.accessKeyId=${AWS_ACCESS_KEY_ID} -Daws.secretKey=${AWS_SECRET_ACCESS_KEY} -Dbucket.name=folio-concorde' -p${port}:8081 folioci/${modName}:${modVer} db_connection=/folio-conf/pg.json
+docker run -d --rm --name ${modName} --mount type=bind,source=/tmp/folio-conf,target=/folio-conf -e JAVA_TOOL_OPTIONS=-Dorg.folio.metadata.inventory.storage.type=okapi -Daws.region=us-west-2 -Daws.accessKeyId=${AWS_ACCESS_KEY_ID} -Daws.secretKey=${AWS_SECRET_ACCESS_KEY} -Dbucket.name=folio-concorde -p${port}:8081 folioci/${modName}:${modVer} db_connection=/folio-conf/pg.json

From 82b3f0d115bbe2ea3144d5a5f2caa458c798b7a1 Mon Sep 17 00:00:00 2001
From: abdenour-drif <78385054+abdenour-drif@users.noreply.github.com>
Date: Fri, 11 Jun 2021 17:07:06 +0300
Subject: [PATCH 067/153] FOLIO-2982 updated mod-data-export.sh

---
 config/mod-data-export.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/config/mod-data-export.sh b/config/mod-data-export.sh
index 0136de2..db4998d 100644
--- a/config/mod-data-export.sh
+++ b/config/mod-data-export.sh
@@ -1 +1 @@
-docker run -d --rm --name ${modName} --mount type=bind,source=/tmp/folio-conf,target=/folio-conf -e JAVA_TOOL_OPTIONS=-Dorg.folio.metadata.inventory.storage.type=okapi -Daws.region=us-west-2 -Daws.accessKeyId=${AWS_ACCESS_KEY_ID} -Daws.secretKey=${AWS_SECRET_ACCESS_KEY} -Dbucket.name=folio-concorde -p${port}:8081 folioci/${modName}:${modVer} db_connection=/folio-conf/pg.json
+docker run -d --rm --name ${modName} --mount type=bind,source=/tmp/folio-conf,target=/folio-conf -e JAVA_OPTIONS="-Dorg.folio.metadata.inventory.storage.type=okapi -Daws.region=us-west-2 -Daws.accessKeyId=${AWS_ACCESS_KEY_ID} -Daws.secretKey=${AWS_SECRET_ACCESS_KEY} -Dbucket.name=folio-concorde" -p${port}:8081 folioci/${modName}:${modVer} db_connection=/folio-conf/pg.json

From 65f5805033a363cd9616b38a6a89cd2404b6a3d3 Mon Sep 17 00:00:00 2001
From: abdenour-drif <78385054+abdenour-drif@users.noreply.github.com>
Date: Fri, 11 Jun 2021 18:39:51 +0300
Subject: [PATCH 068/153] FOLIO-2982 updated mod-data-export.sh

---
 config/mod-data-export.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/config/mod-data-export.sh b/config/mod-data-export.sh
index db4998d..7f0bd24 100644
--- a/config/mod-data-export.sh
+++ b/config/mod-data-export.sh
@@ -1 +1 @@
-docker run -d --rm --name ${modName} --mount type=bind,source=/tmp/folio-conf,target=/folio-conf -e JAVA_OPTIONS="-Dorg.folio.metadata.inventory.storage.type=okapi -Daws.region=us-west-2 -Daws.accessKeyId=${AWS_ACCESS_KEY_ID} -Daws.secretKey=${AWS_SECRET_ACCESS_KEY} -Dbucket.name=folio-concorde" -p${port}:8081 folioci/${modName}:${modVer} db_connection=/folio-conf/pg.json
+docker run -d --rm --name ${modName} --mount type=bind,source=/tmp/folio-conf,target=/folio-conf -e JAVA_OPTIONS=-Dorg.folio.metadata.inventory.storage.type=okapi,-Daws.region=us-west-2,-Daws.accessKeyId=${AWS_ACCESS_KEY_ID},-Daws.secretKey=${AWS_SECRET_ACCESS_KEY},-Dbucket.name=folio-concorde -p${port}:8081 folioci/${modName}:${modVer} db_connection=/folio-conf/pg.json

From 3038c7eb8bf32c071a871bcc3aacd410d61d68f1 Mon Sep 17 00:00:00 2001
From: abdenour-drif <78385054+abdenour-drif@users.noreply.github.com>
Date: Fri, 18 Jun 2021 14:05:08 +0300
Subject: [PATCH 069/153] FOLIO-2982 added s3 credentials to data-export,
 disable few modules ( temp solution )

---
 shared.groovy | 22 +++++++++++++++++++++-
 1 file changed, 21 insertions(+), 1 deletion(-)

diff --git a/shared.groovy b/shared.groovy
index e79ca53..68eba84 100644
--- a/shared.groovy
+++ b/shared.groovy
@@ -451,7 +451,21 @@ def getMods(fixedMods, mdRepo) {
 	if (mod.id.startsWith("mod-service-interaction")) {
       continue
     }
-	
+	if (mod.id.startsWith("mod-tags")) {
+      continue
+    }
+	if (mod.id.startsWith("mod-orders")) {
+      continue
+    }
+	if (mod.id.startsWith("mod-invoice")) {
+      continue
+    }
+	if (mod.id.startsWith("mod-gobi")) {
+      continue
+    }
+	if (mod.id.startsWith("mod-ebsconet")) {
+      continue
+    }
     def group = (mod.id =~ /(^\D+)-(\d+.*$)/)
     def modName = group[0][1]
     // only select backend (mod-) and frontend (folio-) modules
@@ -595,6 +609,12 @@ def deployMods(mods, okapiIp, modsIp, modsPvtIp, dbPvtIp, tenant, sshCmd, sshUse
       modJob = modJob.replace('${dbHost}', dbPvtIp)
       modJob = modJob.replace('${okapiIp}', okapiIp)
     }
+	// added s3 credentials to data-export
+	if (modName.equals("mod-data-export")) { 
+      modJob = readFile("config/mod-data-export.sh").trim()
+      modJob = modJob.replace('${AWS_ACCESS_KEY_ID}', AWS_ACCESS_KEY_ID)
+      modJob = modJob.replace('${AWS_SECRET_ACCESS_KEY}', AWS_SECRET_ACCESS_KEY)
+	}
     // temporary solution to escape mod-service-interaction failure
    //if (modName.equals("mod-service-interaction")) {
     //  continue 

From b8c96135578ebeaabfe673522dd9367a036441bf Mon Sep 17 00:00:00 2001
From: abdenour-drif <78385054+abdenour-drif@users.noreply.github.com>
Date: Tue, 29 Jun 2021 11:43:53 +0300
Subject: [PATCH 070/153] FOLIO-2982 added script to run mod-inventory

---
 config/mod-inventory.sh | 1 +
 1 file changed, 1 insertion(+)
 create mode 100644 config/mod-inventory.sh

diff --git a/config/mod-inventory.sh b/config/mod-inventory.sh
new file mode 100644
index 0000000..0939a88
--- /dev/null
+++ b/config/mod-inventory.sh
@@ -0,0 +1 @@
+docker run -d --rm --name ${modName} --mount type=bind,source=/tmp/folio-conf,target=/folio-conf -e 'KAFKA_HOST=${dbHost}' -e 'KAFKA_PORT=9092' -e 'JAVA_OPTIONS=-Dorg.folio.metadata.inventory.storage.type=okapi' -p${port}:9403 folioci/${modName}:${modVer} db_connection=/folio-conf/pg.json

From 8ec92f227261ba14e9594d8c60ca69e94f603aeb Mon Sep 17 00:00:00 2001
From: abdenour-drif <78385054+abdenour-drif@users.noreply.github.com>
Date: Tue, 29 Jun 2021 13:31:07 +0300
Subject: [PATCH 071/153] FOLIO-2982 added okapi url

---
 config/mod-inventory.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/config/mod-inventory.sh b/config/mod-inventory.sh
index 0939a88..360bb25 100644
--- a/config/mod-inventory.sh
+++ b/config/mod-inventory.sh
@@ -1 +1 @@
-docker run -d --rm --name ${modName} --mount type=bind,source=/tmp/folio-conf,target=/folio-conf -e 'KAFKA_HOST=${dbHost}' -e 'KAFKA_PORT=9092' -e 'JAVA_OPTIONS=-Dorg.folio.metadata.inventory.storage.type=okapi' -p${port}:9403 folioci/${modName}:${modVer} db_connection=/folio-conf/pg.json
+docker run -d --rm --name ${modName} --mount type=bind,source=/tmp/folio-conf,target=/folio-conf -e 'OKAPI_URL=http://${okapiIp}:9130' -e 'KAFKA_HOST=${dbHost}' -e 'KAFKA_PORT=9092' -e 'JAVA_OPTIONS=-Dorg.folio.metadata.inventory.storage.type=okapi' -p${port}:9403 folioci/${modName}:${modVer} db_connection=/folio-conf/pg.json

From 0707d3d485fcf17a08e7baf2755c06028e62348e Mon Sep 17 00:00:00 2001
From: abdenour-drif <78385054+abdenour-drif@users.noreply.github.com>
Date: Wed, 30 Jun 2021 10:03:26 +0300
Subject: [PATCH 072/153] FOLIO-2982 updated shared-groovy file

---
 shared.groovy | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/shared.groovy b/shared.groovy
index 68eba84..665e585 100644
--- a/shared.groovy
+++ b/shared.groovy
@@ -615,6 +615,11 @@ def deployMods(mods, okapiIp, modsIp, modsPvtIp, dbPvtIp, tenant, sshCmd, sshUse
       modJob = modJob.replace('${AWS_ACCESS_KEY_ID}', AWS_ACCESS_KEY_ID)
       modJob = modJob.replace('${AWS_SECRET_ACCESS_KEY}', AWS_SECRET_ACCESS_KEY)
 	}
+	if (modName.equals("mod-inventory")) { 
+      modJob = readFile("config/mod-inventory.sh").trim()
+	  modJob = modJob.replace('${dbHost}', dbPvtIp)
+      modJob = modJob.replace('${okapiIp}', okapiIp)
+	  }
     // temporary solution to escape mod-service-interaction failure
    //if (modName.equals("mod-service-interaction")) {
     //  continue 
@@ -639,12 +644,13 @@ def deployMods(mods, okapiIp, modsIp, modsPvtIp, dbPvtIp, tenant, sshCmd, sshUse
     modJob = modJob.replace('${port}', '' + port)
     modJob = modJob.replace('${modVer}', "" + modVer)
     // mod-inventory uses port 9403, not 8081
-    if (modName.equals("mod-inventory")) {
-      modJob = modJob.replace('8081', '9403')
-    }
+   // if (modName.equals("mod-inventory")) {
+    //  modJob = modJob.replace('8081', '9403')
+   // }
     // mod-circulation uses port 9801, not 8081
     if (modName.equals("mod-circulation")) {
       modJob = modJob.replace('8081', '9801')
+	 
     }
     // mod-login has a special parameter
     if (modName.equals("mod-login")) {

From acb9e248c144f2e2bb737eeb1c2d711f41c6c2e0 Mon Sep 17 00:00:00 2001
From: abdenour-drif <78385054+abdenour-drif@users.noreply.github.com>
Date: Wed, 30 Jun 2021 16:49:05 +0300
Subject: [PATCH 073/153] FOLIO-2982 fixed syntax error

---
 config/mod-data-export.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/config/mod-data-export.sh b/config/mod-data-export.sh
index 7f0bd24..2eee63e 100644
--- a/config/mod-data-export.sh
+++ b/config/mod-data-export.sh
@@ -1 +1 @@
-docker run -d --rm --name ${modName} --mount type=bind,source=/tmp/folio-conf,target=/folio-conf -e JAVA_OPTIONS=-Dorg.folio.metadata.inventory.storage.type=okapi,-Daws.region=us-west-2,-Daws.accessKeyId=${AWS_ACCESS_KEY_ID},-Daws.secretKey=${AWS_SECRET_ACCESS_KEY},-Dbucket.name=folio-concorde -p${port}:8081 folioci/${modName}:${modVer} db_connection=/folio-conf/pg.json
+docker run -d --rm --name ${modName} --mount type=bind,source=/tmp/folio-conf,target=/folio-conf -e JAVA_OPTIONS='-Dorg.folio.metadata.inventory.storage.type=okapi -Daws.region=us-west-2 -Daws.accessKeyId=${AWS_ACCESS_KEY_ID} -Daws.secretKey=${AWS_SECRET_ACCESS_KEY} -Dbucket.name=folio-concorde' -p${port}:8081 folioci/${modName}:${modVer} db_connection=/folio-conf/pg.json

From 7971bc4d664b31dab132bad9f3bdcda0f6e571ee Mon Sep 17 00:00:00 2001
From: abdenour-drif <78385054+abdenour-drif@users.noreply.github.com>
Date: Thu, 1 Jul 2021 00:26:30 +0300
Subject: [PATCH 074/153] FOLIO-2982 updated mod-data-export.sh

---
 config/mod-data-export.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/config/mod-data-export.sh b/config/mod-data-export.sh
index 2eee63e..236a2d0 100644
--- a/config/mod-data-export.sh
+++ b/config/mod-data-export.sh
@@ -1 +1 @@
-docker run -d --rm --name ${modName} --mount type=bind,source=/tmp/folio-conf,target=/folio-conf -e JAVA_OPTIONS='-Dorg.folio.metadata.inventory.storage.type=okapi -Daws.region=us-west-2 -Daws.accessKeyId=${AWS_ACCESS_KEY_ID} -Daws.secretKey=${AWS_SECRET_ACCESS_KEY} -Dbucket.name=folio-concorde' -p${port}:8081 folioci/${modName}:${modVer} db_connection=/folio-conf/pg.json
+docker run -d --rm --name ${modName} --mount type=bind,source=/tmp/folio-conf,target=/folio-conf -e JAVA_OPTIONS=\'-Dorg.folio.metadata.inventory.storage.type=okapi -Daws.region=us-west-2 -Daws.accessKeyId=${AWS_ACCESS_KEY_ID} -Daws.secretKey=${AWS_SECRET_ACCESS_KEY} -Dbucket.name=folio-concorde\' -p${port}:8081 folioci/${modName}:${modVer} db_connection=/folio-conf/pg.json

From 457d94e7f04b38d5842613da3a7b51126d70c14e Mon Sep 17 00:00:00 2001
From: abdenour-drif <78385054+abdenour-drif@users.noreply.github.com>
Date: Wed, 7 Jul 2021 14:14:00 +0300
Subject: [PATCH 075/153] FOLIO-2982 added DB env parameters

---
 config/mod-inventory-storage.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/config/mod-inventory-storage.sh b/config/mod-inventory-storage.sh
index 354fbcd..f95b26b 100644
--- a/config/mod-inventory-storage.sh
+++ b/config/mod-inventory-storage.sh
@@ -1 +1 @@
-docker run -d --rm --name ${modName} --mount type=bind,source=/tmp/folio-conf,target=/folio-conf -e 'KAFKA_HOST=${dbHost}' -e 'KAFKA_PORT=9092' -e 'JAVA_OPTIONS=-Dorg.folio.metadata.inventory.storage.type=okapi' -p${port}:8081 folioci/${modName}:${modVer} db_connection=/folio-conf/pg.json
\ No newline at end of file
+docker run -d --rm --name ${modName} --mount type=bind,source=/tmp/folio-conf,target=/folio-conf -e 'DB_HOST=${dbHost}' -e 'DB_PORT=5432' -e 'DB_DATABASE=folio' -e 'DB_USERNAME=folio' -e 'DB_PASSWORD=folioadmin' -e 'KAFKA_HOST=${dbHost}' -e 'KAFKA_PORT=9092' -e 'JAVA_OPTIONS=-Dorg.folio.metadata.inventory.storage.type=okapi' -p${port}:8081 folioci/${modName}:${modVer} db_connection=/folio-conf/pg.json 

From b4929319e9c36963aed2f7f7a41f96eea07910e0 Mon Sep 17 00:00:00 2001
From: abdenour-drif <78385054+abdenour-drif@users.noreply.github.com>
Date: Fri, 13 Aug 2021 16:11:35 +0300
Subject: [PATCH 076/153] temporary fixed inn-reach failure

---
 shared.groovy | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/shared.groovy b/shared.groovy
index 665e585..0d613c2 100644
--- a/shared.groovy
+++ b/shared.groovy
@@ -447,7 +447,9 @@ def getMods(fixedMods, mdRepo) {
 	if (mod.id.startsWith("mod-data-export-worker")) {
       continue
     }
-    
+    if (mod.id.startsWith("mod-inn-reach")) {
+      continue
+    }
 	if (mod.id.startsWith("mod-service-interaction")) {
       continue
     }

From 3ebdf032fbd7328903455bae119a8a89a9803c5b Mon Sep 17 00:00:00 2001
From: abdenour-drif <78385054+abdenour-drif@users.noreply.github.com>
Date: Mon, 16 Aug 2021 23:24:42 +0300
Subject: [PATCH 077/153] Create mod-inn-reach.sh

---
 config/mod-inn-reach.sh | 1 +
 1 file changed, 1 insertion(+)
 create mode 100644 config/mod-inn-reach.sh

diff --git a/config/mod-inn-reach.sh b/config/mod-inn-reach.sh
new file mode 100644
index 0000000..8b13789
--- /dev/null
+++ b/config/mod-inn-reach.sh
@@ -0,0 +1 @@
+

From b85e11208bc0e7cb237f90dbf597cd85a526db1f Mon Sep 17 00:00:00 2001
From: abdenour-drif <78385054+abdenour-drif@users.noreply.github.com>
Date: Mon, 16 Aug 2021 23:25:27 +0300
Subject: [PATCH 078/153] Update mod-inn-reach.sh

---
 config/mod-inn-reach.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/config/mod-inn-reach.sh b/config/mod-inn-reach.sh
index 8b13789..7085efc 100644
--- a/config/mod-inn-reach.sh
+++ b/config/mod-inn-reach.sh
@@ -1 +1 @@
-
+docker run -d --rm --name ${modName} --mount type=bind,source=/tmp/folio-conf,target=/folio-conf -e 'DB_HOST=${dbHost}' -e 'DB_PORT=5432' -e 'DB_DATABASE=folio' -e 'DB_USERNAME=folio' -e 'DB_PASSWORD=folioadmin' -e 'JAVA_OPTIONS=-Dorg.folio.metadata.inventory.storage.type=okapi' -p${port}:8081 folioci/${modName}:${modVer} db_connection=/folio-conf/pg.json

From 112dc5d83db2765cee4aef26c204e495a7beeaf8 Mon Sep 17 00:00:00 2001
From: abdenour-drif <78385054+abdenour-drif@users.noreply.github.com>
Date: Tue, 17 Aug 2021 09:54:07 +0300
Subject: [PATCH 079/153] added step to read conf for mod-inn-reach

---
 shared.groovy | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/shared.groovy b/shared.groovy
index 0d613c2..d15cc42 100644
--- a/shared.groovy
+++ b/shared.groovy
@@ -446,9 +446,6 @@ def getMods(fixedMods, mdRepo) {
 	
 	if (mod.id.startsWith("mod-data-export-worker")) {
       continue
-    }
-    if (mod.id.startsWith("mod-inn-reach")) {
-      continue
     }
 	if (mod.id.startsWith("mod-service-interaction")) {
       continue
@@ -610,6 +607,11 @@ def deployMods(mods, okapiIp, modsIp, modsPvtIp, dbPvtIp, tenant, sshCmd, sshUse
       modJob = readFile("config/mod-search.sh").trim()
       modJob = modJob.replace('${dbHost}', dbPvtIp)
       modJob = modJob.replace('${okapiIp}', okapiIp)
+    }
+    //mod-inn-reach needs additional db params
+	if (modName.equals("mod-inn-reach")) {
+      modJob = readFile("config/mod-inn-reach.sh").trim()
+      modJob = modJob.replace('${dbHost}', dbPvtIp)
     }
 	// added s3 credentials to data-export
 	if (modName.equals("mod-data-export")) { 

From d8de3ca4492ec05028270f0c0e75994a3a89e0f6 Mon Sep 17 00:00:00 2001
From: abdenour-drif <78385054+abdenour-drif@users.noreply.github.com>
Date: Thu, 19 Aug 2021 13:14:04 +0300
Subject: [PATCH 080/153] added ENV var with default value=folio

---
 config/mod-search.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/config/mod-search.sh b/config/mod-search.sh
index a8623e3..890a110 100644
--- a/config/mod-search.sh
+++ b/config/mod-search.sh
@@ -1 +1 @@
-docker run -d --rm --name ${modName} -e 'DB_HOST=${dbHost}' -e 'DB_PORT=5432' -e 'DB_DATABASE=folio' -e 'DB_USERNAME=folio' -e 'DB_PASSWORD=folioadmin' -e 'KAFKA_HOST=${dbHost}' -e 'KAFKA_PORT=9092' -e 'ELASTICSEARCH_HOST=${dbHost}' -e 'ELASTICSEARCH_PASSWORD=s3cret' -e 'OKAPI_URL=http://${okapiIp}:9130' -p${port}:8081 folioci/${modName}:${modVer}
+docker run -d --rm --name ${modName} -e 'DB_HOST=${dbHost}' -e 'ENV=folio' -e 'DB_PORT=5432' -e 'DB_DATABASE=folio' -e 'DB_USERNAME=folio' -e 'DB_PASSWORD=folioadmin' -e 'KAFKA_HOST=${dbHost}' -e 'KAFKA_PORT=9092' -e 'ELASTICSEARCH_HOST=${dbHost}' -e 'ELASTICSEARCH_PASSWORD=s3cret' -e 'OKAPI_URL=http://${okapiIp}:9130' -p${port}:8081 folioci/${modName}:${modVer}

From f69f8dbcd3984d172318abe6ab4ff05f1cecef1d Mon Sep 17 00:00:00 2001
From: abdenour-drif <78385054+abdenour-drif@users.noreply.github.com>
Date: Thu, 19 Aug 2021 16:47:55 +0300
Subject: [PATCH 081/153] FOLIO-3265 changed target folder for karate tests
 (#197)

Co-authored-by: abdenour-drif <abdenour_drif@email.com>
---
 shared.groovy | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/shared.groovy b/shared.groovy
index d15cc42..a4865fb 100644
--- a/shared.groovy
+++ b/shared.groovy
@@ -346,7 +346,7 @@ def runIntegrationTests(ctx) {
       }
     }
     sh "mkdir ${env.WORKSPACE}/folio-integration-tests/cucumber-reports"
-    sh "find . | grep json | grep '/target/surefire-reports/' | xargs -i cp {} ${env.WORKSPACE}/folio-integration-tests/cucumber-reports"
+    sh "find . | grep json | grep '/target/karate-reports' | xargs -i cp {} ${env.WORKSPACE}/folio-integration-tests/cucumber-reports"
     cucumber buildStatus: "UNSTABLE",
       fileIncludePattern: "*.json",
       jsonReportDirectory: "cucumber-reports"

From 51acb6c5915462cd68e069f75513b452d7f117c7 Mon Sep 17 00:00:00 2001
From: abdenour-drif <78385054+abdenour-drif@users.noreply.github.com>
Date: Mon, 23 Aug 2021 15:54:58 +0300
Subject: [PATCH 082/153] FOLIO-3266 added invoice modules to thedeploy list
 (#198)

Co-authored-by: abdenour-drif <abdenour_drif@email.com>
---
 shared.groovy | 19 +++----------------
 1 file changed, 3 insertions(+), 16 deletions(-)

diff --git a/shared.groovy b/shared.groovy
index a4865fb..18361d4 100644
--- a/shared.groovy
+++ b/shared.groovy
@@ -449,21 +449,6 @@ def getMods(fixedMods, mdRepo) {
     }
 	if (mod.id.startsWith("mod-service-interaction")) {
       continue
-    }
-	if (mod.id.startsWith("mod-tags")) {
-      continue
-    }
-	if (mod.id.startsWith("mod-orders")) {
-      continue
-    }
-	if (mod.id.startsWith("mod-invoice")) {
-      continue
-    }
-	if (mod.id.startsWith("mod-gobi")) {
-      continue
-    }
-	if (mod.id.startsWith("mod-ebsconet")) {
-      continue
     }
     def group = (mod.id =~ /(^\D+)-(\d+.*$)/)
     def modName = group[0][1]
@@ -609,7 +594,9 @@ def deployMods(mods, okapiIp, modsIp, modsPvtIp, dbPvtIp, tenant, sshCmd, sshUse
       modJob = modJob.replace('${okapiIp}', okapiIp)
     }
     //mod-inn-reach needs additional db params
-	if (modName.equals("mod-inn-reach")) {
+	if ((modName.equals("mod-inn-reach")) ||
+	modName.equals("mod-tags"))
+	{
       modJob = readFile("config/mod-inn-reach.sh").trim()
       modJob = modJob.replace('${dbHost}', dbPvtIp)
     }

From 082f08aee3e4d955d79ad45ec68321f69e7824ee Mon Sep 17 00:00:00 2001
From: Hleb Surnovich <Hleb_Surnovich@epam.com>
Date: Wed, 8 Sep 2021 13:35:37 +0300
Subject: [PATCH 083/153] FAT-958 Change source for dataset to new s3 in params

---
 Jenkinsfile.integration | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Jenkinsfile.integration b/Jenkinsfile.integration
index 237ea63..cb05aac 100644
--- a/Jenkinsfile.integration
+++ b/Jenkinsfile.integration
@@ -18,7 +18,7 @@ properties([
     string(name: 'StableFolio', defaultValue: 'https://folio-snapshot.dev.folio.org', description: 'Use stable version of modules'),
     string(name: 'FixedOkapi', defaultValue: 'latest', description: 'Use specified version of Okapi'),
     text(name: 'FixedMods', defaultValue: '', description: 'Paste install.json content here to use predefined module versions rather than pulling from stable FOLIO site'),
-    string(name: 'SampleDataRepo', defaultValue: 'https://s3.amazonaws.com/folio-public-sample-data', description: 'Sample data repository'),
+    string(name: 'SampleDataRepo', defaultValue: 'https://folio-public-sample-data-jenkins.s3.us-west-2.amazonaws.com', description: 'Sample data repository'),
     string(name: 'SampleDataName', defaultValue: 'perf', description: 'Sample dataset name'),
     string(name: 'TestRailUrl', defaultValue: 'https://foliotest.testrail.io', description: 'TestRail reporitng server URL'),
     string(name: 'TestRailProjectId', defaultValue: '19', description: 'TestRail Project ID for Intgegration tests'),

From d824706af107f74b4e1166539aad495eb40751bc Mon Sep 17 00:00:00 2001
From: Mykola Borhuk <mborchuk@ebsko.com>
Date: Mon, 13 Sep 2021 18:19:52 +0300
Subject: [PATCH 084/153] FOLIO-2982 Added a new module to env

---
 config/mod-oa.sh |  1 +
 shared.groovy    | 28 +++++++++++++++++-----------
 2 files changed, 18 insertions(+), 11 deletions(-)
 create mode 100644 config/mod-oa.sh

diff --git a/config/mod-oa.sh b/config/mod-oa.sh
new file mode 100644
index 0000000..61d8c96
--- /dev/null
+++ b/config/mod-oa.sh
@@ -0,0 +1 @@
+docker run -d --rm --name ${modName} --mount type=bind,source=/tmp/folio-conf,target=/folio-conf -e 'OKAPI_SERVICE_PORT=9130' -e 'OKAPI_SERVICE_HOST=http://${okapiIp}' -e JAVA_OPTIONS=-Dorg.folio.metadata.inventory.storage.type=okapi -p${port}:8081 folioci/${modName}:${modVer} db_connection=/folio-conf/pg.json
diff --git a/shared.groovy b/shared.groovy
index 18361d4..f57bc74 100644
--- a/shared.groovy
+++ b/shared.groovy
@@ -443,7 +443,7 @@ def getMods(fixedMods, mdRepo) {
     if (mod.id.startsWith("mod-data-export-spring")) {
       continue
     }
-	
+
 	if (mod.id.startsWith("mod-data-export-worker")) {
       continue
     }
@@ -571,17 +571,17 @@ def deployMods(mods, okapiIp, modsIp, modsPvtIp, dbPvtIp, tenant, sshCmd, sshUse
       }
     }
     // mod-inventory-storage, mod-source-record-storage and mod-ebsconet have different env variables
-    if (modName.equals("mod-inventory-storage") || 
-    modName.equals("mod-source-record-storage") || 
-    modName.equals("mod-ebsconet") || 
+    if (modName.equals("mod-inventory-storage") ||
+    modName.equals("mod-source-record-storage") ||
+    modName.equals("mod-ebsconet") ||
     modName.equals("mod-source-record-manager")) {
       modJob = readFile("config/mod-inventory-storage.sh").trim()
       modJob = modJob.replace('${dbHost}', dbPvtIp)
       modJob = modJob.replace('${okapiIp}', okapiIp)
     }
     // mod-bursar-export and mod-password-validator have different env variables
-    if (modName.equals("mod-bursar-export") || 
-    modName.equals("mod-password-validator") || 
+    if (modName.equals("mod-bursar-export") ||
+    modName.equals("mod-password-validator") ||
     modName.equals("mod-login")) {
       modJob = readFile("config/mod-bursar-export.sh").trim()
       modJob = modJob.replace('${dbHost}', dbPvtIp)
@@ -593,6 +593,12 @@ def deployMods(mods, okapiIp, modsIp, modsPvtIp, dbPvtIp, tenant, sshCmd, sshUse
       modJob = modJob.replace('${dbHost}', dbPvtIp)
       modJob = modJob.replace('${okapiIp}', okapiIp)
     }
+    // mod-search has different env variables
+    if (modName.equals("mod-oa")) {
+      modJob = readFile("config/mod-oa.sh").trim()
+      modJob = modJob.replace('${dbHost}', dbPvtIp)
+      modJob = modJob.replace('${okapiIp}', okapiIp)
+    }
     //mod-inn-reach needs additional db params
 	if ((modName.equals("mod-inn-reach")) ||
 	modName.equals("mod-tags"))
@@ -601,25 +607,25 @@ def deployMods(mods, okapiIp, modsIp, modsPvtIp, dbPvtIp, tenant, sshCmd, sshUse
       modJob = modJob.replace('${dbHost}', dbPvtIp)
     }
 	// added s3 credentials to data-export
-	if (modName.equals("mod-data-export")) { 
+	if (modName.equals("mod-data-export")) {
       modJob = readFile("config/mod-data-export.sh").trim()
       modJob = modJob.replace('${AWS_ACCESS_KEY_ID}', AWS_ACCESS_KEY_ID)
       modJob = modJob.replace('${AWS_SECRET_ACCESS_KEY}', AWS_SECRET_ACCESS_KEY)
 	}
-	if (modName.equals("mod-inventory")) { 
+	if (modName.equals("mod-inventory")) {
       modJob = readFile("config/mod-inventory.sh").trim()
 	  modJob = modJob.replace('${dbHost}', dbPvtIp)
       modJob = modJob.replace('${okapiIp}', okapiIp)
 	  }
     // temporary solution to escape mod-service-interaction failure
    //if (modName.equals("mod-service-interaction")) {
-    //  continue 
+    //  continue
       // modJob = readFile("config/mod-service-interaction.sh").trim()
       // modJob = modJob.replace('${dbHost}', dbPvtIp)
       // modJob = modJob.replace('${okapiIp}', okapiIp)
    // }
     // mod-pubsub has different env variables
-    if (modName.equals("mod-pubsub") || 
+    if (modName.equals("mod-pubsub") ||
     modName.equals("mod-ebsconet") ||
     modName.equals("mod-remote-storage") ||
     modName.equals("mod-quick-marc")) {
@@ -641,7 +647,7 @@ def deployMods(mods, okapiIp, modsIp, modsPvtIp, dbPvtIp, tenant, sshCmd, sshUse
     // mod-circulation uses port 9801, not 8081
     if (modName.equals("mod-circulation")) {
       modJob = modJob.replace('8081', '9801')
-	 
+
     }
     // mod-login has a special parameter
     if (modName.equals("mod-login")) {

From 051e3df44cc05167ceef58b980bc8799670b7717 Mon Sep 17 00:00:00 2001
From: Mykola Borhuk <mborchuk@ebsko.com>
Date: Mon, 13 Sep 2021 18:33:32 +0300
Subject: [PATCH 085/153] FOLIO-2982 Added a new module to env

---
 config/mod-oa.sh | 2 +-
 shared.groovy    | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/config/mod-oa.sh b/config/mod-oa.sh
index 61d8c96..dde20db 100644
--- a/config/mod-oa.sh
+++ b/config/mod-oa.sh
@@ -1 +1 @@
-docker run -d --rm --name ${modName} --mount type=bind,source=/tmp/folio-conf,target=/folio-conf -e 'OKAPI_SERVICE_PORT=9130' -e 'OKAPI_SERVICE_HOST=http://${okapiIp}' -e JAVA_OPTIONS=-Dorg.folio.metadata.inventory.storage.type=okapi -p${port}:8081 folioci/${modName}:${modVer} db_connection=/folio-conf/pg.json
+docker run -d --rm --name ${modName} -e 'OKAPI_SERVICE_PORT=9130' -e 'OKAPI_SERVICE_HOST=http://${okapiIp}' -e 'JAVA_OPTIONS="-server -XX:+UseContainerSupport -XX:MaxRAMPercentage=55.0 -XX:+PrintFlagsFinal"' -p${port}:8081 folioci/${modName}:${modVer}
diff --git a/shared.groovy b/shared.groovy
index f57bc74..767113b 100644
--- a/shared.groovy
+++ b/shared.groovy
@@ -593,7 +593,7 @@ def deployMods(mods, okapiIp, modsIp, modsPvtIp, dbPvtIp, tenant, sshCmd, sshUse
       modJob = modJob.replace('${dbHost}', dbPvtIp)
       modJob = modJob.replace('${okapiIp}', okapiIp)
     }
-    // mod-search has different env variables
+    // mod-oa has different env variables
     if (modName.equals("mod-oa")) {
       modJob = readFile("config/mod-oa.sh").trim()
       modJob = modJob.replace('${dbHost}', dbPvtIp)

From 5f5e2d526b514c246273e4804f968985a6312271 Mon Sep 17 00:00:00 2001
From: Mykola Borhuk <mborchuk@ebsko.com>
Date: Mon, 13 Sep 2021 18:35:05 +0300
Subject: [PATCH 086/153] FOLIO-2982 Added a new module to env

---
 Jenkinsfile.integration | 1 +
 1 file changed, 1 insertion(+)

diff --git a/Jenkinsfile.integration b/Jenkinsfile.integration
index cb05aac..f1421e7 100644
--- a/Jenkinsfile.integration
+++ b/Jenkinsfile.integration
@@ -78,6 +78,7 @@ node('jenkins-agent-java11') {
             }
           }
         } catch (e) {
+          sleep 1800
           currentBuild.result = 'FAILURE'
           throw e
         } finally {

From a9e906bd71dc353e26c6b733507792b2010f867c Mon Sep 17 00:00:00 2001
From: Mykola Borhuk <mborchuk@ebsko.com>
Date: Mon, 13 Sep 2021 18:42:15 +0300
Subject: [PATCH 087/153] FOLIO-2982 Added a new module to env

---
 config/mod-oa.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/config/mod-oa.sh b/config/mod-oa.sh
index dde20db..4334bd0 100644
--- a/config/mod-oa.sh
+++ b/config/mod-oa.sh
@@ -1 +1 @@
-docker run -d --rm --name ${modName} -e 'OKAPI_SERVICE_PORT=9130' -e 'OKAPI_SERVICE_HOST=http://${okapiIp}' -e 'JAVA_OPTIONS="-server -XX:+UseContainerSupport -XX:MaxRAMPercentage=55.0 -XX:+PrintFlagsFinal"' -p${port}:8081 folioci/${modName}:${modVer}
+docker run -d --rm --name ${modName} -e 'OKAPI_SERVICE_PORT=9130' -e 'OKAPI_SERVICE_HOST=${okapiIp}' -e 'JAVA_OPTIONS="-server -XX:+UseContainerSupport -XX:MaxRAMPercentage=55.0 -XX:+PrintFlagsFinal"' -p${port}:8081 folioci/${modName}:${modVer}

From 2720223c37edaf4fa5d03e41e4e6ad61ae0f4dfb Mon Sep 17 00:00:00 2001
From: Mykola Borhuk <mborchuk@ebsko.com>
Date: Mon, 13 Sep 2021 19:01:47 +0300
Subject: [PATCH 088/153] FOLIO-2982 Added a new module to env

---
 config/mod-oa.sh | 2 +-
 config/mods.sh   | 2 +-
 shared.groovy    | 1 -
 3 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/config/mod-oa.sh b/config/mod-oa.sh
index 4334bd0..edcffee 100644
--- a/config/mod-oa.sh
+++ b/config/mod-oa.sh
@@ -1 +1 @@
-docker run -d --rm --name ${modName} -e 'OKAPI_SERVICE_PORT=9130' -e 'OKAPI_SERVICE_HOST=${okapiIp}' -e 'JAVA_OPTIONS="-server -XX:+UseContainerSupport -XX:MaxRAMPercentage=55.0 -XX:+PrintFlagsFinal"' -p${port}:8081 folioci/${modName}:${modVer}
+docker run -d --rm --name ${modName} -e 'OKAPI_SERVICE_PORT=9130' -e 'OKAPI_SERVICE_HOST=${okapiIp}' -e 'JAVA_OPTIONS="-server -XX:+UseContainerSupport -XX:MaxRAMPercentage=55.0 -XX:+PrintFlagsFinal"' -p${port}:8080 folioci/${modName}:${modVer}
diff --git a/config/mods.sh b/config/mods.sh
index 88c4350..61f61f7 100644
--- a/config/mods.sh
+++ b/config/mods.sh
@@ -1 +1 @@
-docker run -d --rm --name ${modName} --mount type=bind,source=/tmp/folio-conf,target=/folio-conf -e 'JAVA_OPTIONS=-Dorg.folio.metadata.inventory.storage.type=okapi' -p${port}:8081 folioci/${modName}:${modVer} db_connection=/folio-conf/pg.json
+docker run -d --name ${modName} --mount type=bind,source=/tmp/folio-conf,target=/folio-conf -e 'JAVA_OPTIONS=-Dorg.folio.metadata.inventory.storage.type=okapi' -p${port}:8081 folioci/${modName}:${modVer} db_connection=/folio-conf/pg.json
diff --git a/shared.groovy b/shared.groovy
index 767113b..0fc5b29 100644
--- a/shared.groovy
+++ b/shared.groovy
@@ -596,7 +596,6 @@ def deployMods(mods, okapiIp, modsIp, modsPvtIp, dbPvtIp, tenant, sshCmd, sshUse
     // mod-oa has different env variables
     if (modName.equals("mod-oa")) {
       modJob = readFile("config/mod-oa.sh").trim()
-      modJob = modJob.replace('${dbHost}', dbPvtIp)
       modJob = modJob.replace('${okapiIp}', okapiIp)
     }
     //mod-inn-reach needs additional db params

From 8f57b9d16c77328219e9970c34d7eca9c74bcf6c Mon Sep 17 00:00:00 2001
From: Hleb Surnovich <Hleb_Surnovich@epam.com>
Date: Mon, 13 Sep 2021 22:23:37 +0300
Subject: [PATCH 089/153] FOLIO-2982 fix erm config with deleting --rm

---
 config/mod-erm.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/config/mod-erm.sh b/config/mod-erm.sh
index 165183b..493f07c 100644
--- a/config/mod-erm.sh
+++ b/config/mod-erm.sh
@@ -1 +1 @@
-docker run -d --rm --name ${modName} -e 'DB_HOST=${dbHost}' -e 'DB_PORT=5432' -e 'DB_DATABASE=folio' -e 'DB_USERNAME=folio' -e 'DB_PASSWORD=folioadmin' -p${port}:8080 folioci/${modName}:${modVer}
+docker run -d --name ${modName} -e 'DB_HOST=${dbHost}' -e 'DB_PORT=5432' -e 'DB_DATABASE=folio' -e 'DB_USERNAME=folio' -e 'DB_PASSWORD=folioadmin' -p${port}:8080 folioci/${modName}:${modVer}

From a8d3669318a69f1450b9a9931b3c2649b31b027f Mon Sep 17 00:00:00 2001
From: Hleb Surnovich <Hleb_Surnovich@epam.com>
Date: Tue, 14 Sep 2021 10:12:02 +0300
Subject: [PATCH 090/153] FOLIO-2982 turned mod-oa off because of bugs

---
 shared.groovy | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/shared.groovy b/shared.groovy
index 0fc5b29..9866831 100644
--- a/shared.groovy
+++ b/shared.groovy
@@ -437,6 +437,9 @@ def getMods(fixedMods, mdRepo) {
     if (mod.id.startsWith("edge-sip2")) {
       continue
     }
+    if (mod.id.startsWith("mod-oa")) {
+      continue
+    }
 
     // registering in Okapi issue
     // should be fixed later

From dfda34a55410414272d23081854a56ecadba2998 Mon Sep 17 00:00:00 2001
From: Hleb Surnovich <Hleb_Surnovich@epam.com>
Date: Thu, 16 Sep 2021 19:11:16 +0300
Subject: [PATCH 091/153] FOLIO-2982 added secret var for mod-kb-ebsco

---
 shared.groovy | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/shared.groovy b/shared.groovy
index 9866831..968312e 100644
--- a/shared.groovy
+++ b/shared.groovy
@@ -341,8 +341,12 @@ def runIntegrationTests(ctx) {
       mavenSettingsConfig: 'folioci-maven-settings'
     ) {
       def okapiDns = "ec2-" + ctx.okapiIp.replaceAll(/\./, "-") + ".compute-1.amazonaws.com"
-      withCredentials([usernamePassword(credentialsId: 'testrail-ut56', passwordVariable: 'testrail_password', usernameVariable: 'testrail_user')]) {
-      sh "mvn test -Dkarate.env=${okapiDns} -DfailIfNoTests=false -Dtestrail_url=${TestRailUrl} -Dtestrail_userId=${testrail_user} -Dtestrail_pwd=${testrail_password} -Dtestrail_projectId=${TestRailProjectId}"
+      withCredentials([usernamePassword(credentialsId: 'testrail-ut56', passwordVariable: 'testrail_password', usernameVariable: 'testrail_user'), string(credentialsId: 'mod-kb-ebsco-key', variable: 'ebsco_key')]) {
+      sh """
+      export kbEbscoCredentialsApiKey=${ebsco_key}
+      echo \$kbEbscoCredentialsApiKey
+      mvn test -Dkarate.env=${okapiDns} -DfailIfNoTests=false -Dtestrail_url=${TestRailUrl} -Dtestrail_userId=${testrail_user} -Dtestrail_pwd=${testrail_password} -Dtestrail_projectId=${TestRailProjectId}
+      """
       }
     }
     sh "mkdir ${env.WORKSPACE}/folio-integration-tests/cucumber-reports"

From af53ec784a450255fe27f1de54671c289a2c2104 Mon Sep 17 00:00:00 2001
From: Hleb Surnovich <Hleb_Surnovich@epam.com>
Date: Thu, 23 Sep 2021 17:58:42 +0300
Subject: [PATCH 092/153] FOLIO-2982 turning off mod-eusage-reports

---
 shared.groovy | 25 +++++++++++++++++++++++--
 1 file changed, 23 insertions(+), 2 deletions(-)

diff --git a/shared.groovy b/shared.groovy
index 968312e..e614ab3 100644
--- a/shared.groovy
+++ b/shared.groovy
@@ -350,7 +350,25 @@ def runIntegrationTests(ctx) {
       }
     }
     sh "mkdir ${env.WORKSPACE}/folio-integration-tests/cucumber-reports"
-    sh "find . | grep json | grep '/target/karate-reports' | xargs -i cp {} ${env.WORKSPACE}/folio-integration-tests/cucumber-reports"
+    sh """
+    path_rep="${env.WORKSPACE}/folio-integration-tests/cucumber-reports"
+    test_list=\$(find . | grep json | grep '/target/karate-reports')
+    for file in \$test_list
+    do
+      sname=\${file##*/}
+      tp=\${sname##*\\.}
+      name=\${sname%\\.\$tp}
+      cc=\$sname
+      i=0
+      while [ -a "\${path_rep}/\${sname}" ]
+        do
+        i=\$(( \$i + 1 ))       
+        sname="\${name}_\${i}.\${tp}"
+      done
+      cp \$file \${path_rep}/\$sname
+    done
+    """
+    //sh "find . | grep json | grep '/target/karate-reports' | xargs -i cp {} ${env.WORKSPACE}/folio-integration-tests/cucumber-reports"
     cucumber buildStatus: "UNSTABLE",
       fileIncludePattern: "*.json",
       jsonReportDirectory: "cucumber-reports"
@@ -436,7 +454,7 @@ def getMods(fixedMods, mdRepo) {
   }
   def latestMods = [:]
   for (mod in mods) {
-// skip edge-sip2 for now due to regex issue
+// skip edge-sip2, mod-oa, mod eusage for now due to regex issue
     // should be fixed later
     if (mod.id.startsWith("edge-sip2")) {
       continue
@@ -444,6 +462,9 @@ def getMods(fixedMods, mdRepo) {
     if (mod.id.startsWith("mod-oa")) {
       continue
     }
+    if (mod.id.startsWith("mod-eusage-reports")) {
+      continue
+    }
 
     // registering in Okapi issue
     // should be fixed later

From 59a79480572f52148cd63f600b8a07bf1301c1b5 Mon Sep 17 00:00:00 2001
From: Hleb Surnovich <Hleb_Surnovich@epam.com>
Date: Tue, 28 Sep 2021 14:15:39 +0300
Subject: [PATCH 093/153] FOLIO-2982 added secret variables for mod-ebsco

---
 shared.groovy | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/shared.groovy b/shared.groovy
index e614ab3..4826236 100644
--- a/shared.groovy
+++ b/shared.groovy
@@ -341,10 +341,11 @@ def runIntegrationTests(ctx) {
       mavenSettingsConfig: 'folioci-maven-settings'
     ) {
       def okapiDns = "ec2-" + ctx.okapiIp.replaceAll(/\./, "-") + ".compute-1.amazonaws.com"
-      withCredentials([usernamePassword(credentialsId: 'testrail-ut56', passwordVariable: 'testrail_password', usernameVariable: 'testrail_user'), string(credentialsId: 'mod-kb-ebsco-key', variable: 'ebsco_key')]) {
+      withCredentials([usernamePassword(credentialsId: 'testrail-ut56', passwordVariable: 'testrail_password', usernameVariable: 'testrail_user'), string(credentialsId: 'mod-kb-ebsco-key', variable: 'ebsco_key'), string(credentialsId: 'mod-kb-ebsco-url', variable: 'ebsco_url'), string(credentialsId: 'mod-kb-ebsco-id', variable: 'ebsco_id')]) {
       sh """
       export kbEbscoCredentialsApiKey=${ebsco_key}
-      echo \$kbEbscoCredentialsApiKey
+      export kbEbscoCredentialsUrl=${ebsco_url}
+      export kbEbscoCredentialsCustomerId=${ebsco_id}
       mvn test -Dkarate.env=${okapiDns} -DfailIfNoTests=false -Dtestrail_url=${TestRailUrl} -Dtestrail_userId=${testrail_user} -Dtestrail_pwd=${testrail_password} -Dtestrail_projectId=${TestRailProjectId}
       """
       }

From 055cf9de4dc0b1995a14567d1ff3fef216a65206 Mon Sep 17 00:00:00 2001
From: Hleb Surnovich <Hleb_Surnovich@epam.com>
Date: Wed, 29 Sep 2021 14:19:57 +0300
Subject: [PATCH 094/153] secret vars added to a test stage

---
 shared.groovy | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/shared.groovy b/shared.groovy
index 4826236..050697e 100644
--- a/shared.groovy
+++ b/shared.groovy
@@ -346,7 +346,7 @@ def runIntegrationTests(ctx) {
       export kbEbscoCredentialsApiKey=${ebsco_key}
       export kbEbscoCredentialsUrl=${ebsco_url}
       export kbEbscoCredentialsCustomerId=${ebsco_id}
-      mvn test -Dkarate.env=${okapiDns} -DfailIfNoTests=false -Dtestrail_url=${TestRailUrl} -Dtestrail_userId=${testrail_user} -Dtestrail_pwd=${testrail_password} -Dtestrail_projectId=${TestRailProjectId}
+      mvn test -Dkarate.env=${okapiDns} -DfailIfNoTests=false -Dtestrail_url=${TestRailUrl} -Dtestrail_userId=${testrail_user} -Dtestrail_pwd=${testrail_password} -Dtestrail_projectId=${TestRailProjectId} -DkbEbscoCredentialsApiKey=${ebsco_key} -DkbEbscoCredentialsUrl=${ebsco_url} -DkbEbscoCredentialsCustomerId=${ebsco_id}
       """
       }
     }

From 4427ad6101ec70a734712c1b3c5b1ea4f9f672f1 Mon Sep 17 00:00:00 2001
From: Hleb Surnovich <Hleb_Surnovich@epam.com>
Date: Fri, 29 Oct 2021 18:45:57 +0300
Subject: [PATCH 095/153] FOLIO-2982 change pgdb from 10 to 12

---
 config/db.sh  | 2 +-
 shared.groovy | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/config/db.sh b/config/db.sh
index 100c67f..c752f54 100644
--- a/config/db.sh
+++ b/config/db.sh
@@ -1 +1 @@
-docker run -d --rm --name foliodb -e POSTGRES_USER=folio -e POSTGRES_PASSWORD=folioadmin -p5432:5432 postgres:10 -N 1000
+docker run -d --rm --name foliodb -e POSTGRES_USER=folio -e POSTGRES_PASSWORD=folioadmin -p5432:5432 postgres:12 -N 1000
diff --git a/shared.groovy b/shared.groovy
index 050697e..242ca73 100644
--- a/shared.groovy
+++ b/shared.groovy
@@ -85,7 +85,7 @@ def waitForEnv(ctx) {
 def bootstrapDb(ctx) {
   stopFolioDockers(ctx, ctx.dbIp)
   sh "${ctx.sshCmd} -l ${ctx.sshUser} ${ctx.dbIp} sudo service ecs stop"
-  sh "${ctx.sshCmd} -l ${ctx.sshUser} ${ctx.dbIp} sudo amazon-linux-extras install -y postgresql10"
+  sh "${ctx.sshCmd} -l ${ctx.sshUser} ${ctx.dbIp} sudo amazon-linux-extras install -y postgresql12"
   sh "${ctx.sshCmd} -l ${ctx.sshUser} ${ctx.dbIp} sudo yum install -y jq wget"
   sh "${ctx.sshCmd} -l ${ctx.sshUser} ${ctx.dbIp} sudo yum install -y git"
   sh "${ctx.sshCmd} -l ${ctx.sshUser} ${ctx.dbIp} sudo curl -L https://github.com/docker/compose/releases/download/1.25.4/docker-compose-\$(uname -s)-\$(uname -m) -o /usr/local/bin/docker-compose"

From ddc659ddc6d243347985b61c166c9944a7b29125 Mon Sep 17 00:00:00 2001
From: Hleb Surnovich <Hleb_Surnovich@epam.com>
Date: Mon, 1 Nov 2021 09:46:48 +0300
Subject: [PATCH 096/153] FOLIO-2982 timeout value increased

---
 Jenkinsfile.integration | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Jenkinsfile.integration b/Jenkinsfile.integration
index f1421e7..e5069f5 100644
--- a/Jenkinsfile.integration
+++ b/Jenkinsfile.integration
@@ -30,7 +30,7 @@ def context
 
 
 node('jenkins-agent-java11') {
-  timeout(180) {
+  timeout(200) {
 
     stage("Checkout") {
       cleanWs()

From fb93f4e7bea82e3818bb9953a704ec99ed48aac6 Mon Sep 17 00:00:00 2001
From: Hleb Surnovich <Hleb_Surnovich@epam.com>
Date: Mon, 1 Nov 2021 10:10:27 +0300
Subject: [PATCH 097/153] FOLIO-2982 timeout increased& timer commented

---
 Jenkinsfile.integration | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/Jenkinsfile.integration b/Jenkinsfile.integration
index e5069f5..e5845df 100644
--- a/Jenkinsfile.integration
+++ b/Jenkinsfile.integration
@@ -30,7 +30,7 @@ def context
 
 
 node('jenkins-agent-java11') {
-  timeout(200) {
+  timeout(210) {
 
     stage("Checkout") {
       cleanWs()
@@ -78,7 +78,8 @@ node('jenkins-agent-java11') {
             }
           }
         } catch (e) {
-          sleep 1800
+          // turn the timer on in case of failures
+          //sleep 1800
           currentBuild.result = 'FAILURE'
           throw e
         } finally {

From 643d012a27665c5504ba0ea62d0a0eb33d53c902 Mon Sep 17 00:00:00 2001
From: Hleb Surnovich <Hleb_Surnovich@epam.com>
Date: Mon, 1 Nov 2021 21:54:45 +0300
Subject: [PATCH 098/153] FOLIO-2982 timeout increased to 300 minutes

---
 Jenkinsfile.integration | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Jenkinsfile.integration b/Jenkinsfile.integration
index e5845df..4832f33 100644
--- a/Jenkinsfile.integration
+++ b/Jenkinsfile.integration
@@ -30,7 +30,7 @@ def context
 
 
 node('jenkins-agent-java11') {
-  timeout(210) {
+  timeout(300) {
 
     stage("Checkout") {
       cleanWs()

From 57411807523373b2efb1cd9de0a0bb70a8c27a61 Mon Sep 17 00:00:00 2001
From: Aliaksei-Luhavy <aliaksei_luhavy@epam.com>
Date: Tue, 26 Oct 2021 14:45:05 +0300
Subject: [PATCH 099/153] FAT-963 Added mod-data-import.sh with OKAPI_URL,
 KAFKA_HOST, KAFKA_PORT, ENV

FAT-963 Updated docker run command for SRS, SRM, inventory-storage, ebsconet, data-import

FAT-963 Set specific parameters for mod-data-import-converter-storage & mod-users
---
 config/mod-data-import-converter-storage.sh |  1 +
 config/mod-data-import.sh                   |  1 +
 config/mod-inventory-storage.sh             |  2 +-
 shared.groovy                               | 14 +++++++++++---
 4 files changed, 14 insertions(+), 4 deletions(-)
 create mode 100644 config/mod-data-import-converter-storage.sh
 create mode 100644 config/mod-data-import.sh

diff --git a/config/mod-data-import-converter-storage.sh b/config/mod-data-import-converter-storage.sh
new file mode 100644
index 0000000..7085efc
--- /dev/null
+++ b/config/mod-data-import-converter-storage.sh
@@ -0,0 +1 @@
+docker run -d --rm --name ${modName} --mount type=bind,source=/tmp/folio-conf,target=/folio-conf -e 'DB_HOST=${dbHost}' -e 'DB_PORT=5432' -e 'DB_DATABASE=folio' -e 'DB_USERNAME=folio' -e 'DB_PASSWORD=folioadmin' -e 'JAVA_OPTIONS=-Dorg.folio.metadata.inventory.storage.type=okapi' -p${port}:8081 folioci/${modName}:${modVer} db_connection=/folio-conf/pg.json
diff --git a/config/mod-data-import.sh b/config/mod-data-import.sh
new file mode 100644
index 0000000..9a2587a
--- /dev/null
+++ b/config/mod-data-import.sh
@@ -0,0 +1 @@
+docker run -d --rm --name ${modName} --mount type=bind,source=/tmp/folio-conf,target=/folio-conf -e 'OKAPI_URL=http://${okapiIp}:9130' -e 'KAFKA_HOST=${dbHost}' -e 'KAFKA_PORT=9092' -e 'ENV=${envName}' -e 'JAVA_OPTIONS=-Dorg.folio.metadata.inventory.storage.type=okapi' -p${port}:8081 folioci/${modName}:${modVer} db_connection=/folio-conf/pg.json
diff --git a/config/mod-inventory-storage.sh b/config/mod-inventory-storage.sh
index f95b26b..232bc6a 100644
--- a/config/mod-inventory-storage.sh
+++ b/config/mod-inventory-storage.sh
@@ -1 +1 @@
-docker run -d --rm --name ${modName} --mount type=bind,source=/tmp/folio-conf,target=/folio-conf -e 'DB_HOST=${dbHost}' -e 'DB_PORT=5432' -e 'DB_DATABASE=folio' -e 'DB_USERNAME=folio' -e 'DB_PASSWORD=folioadmin' -e 'KAFKA_HOST=${dbHost}' -e 'KAFKA_PORT=9092' -e 'JAVA_OPTIONS=-Dorg.folio.metadata.inventory.storage.type=okapi' -p${port}:8081 folioci/${modName}:${modVer} db_connection=/folio-conf/pg.json 
+docker run -d --rm --name ${modName} --mount type=bind,source=/tmp/folio-conf,target=/folio-conf -e 'OKAPI_URL=http://${okapiIp}:9130' -e 'ENV=${envName}' -e 'DB_HOST=${dbHost}' -e 'DB_PORT=5432' -e 'DB_DATABASE=folio' -e 'DB_USERNAME=folio' -e 'DB_PASSWORD=folioadmin' -e 'KAFKA_HOST=${dbHost}' -e 'KAFKA_PORT=9092' -e 'JAVA_OPTIONS=-Dorg.folio.metadata.inventory.storage.type=okapi' -p${port}:8081 folioci/${modName}:${modVer} db_connection=/folio-conf/pg.json 
diff --git a/shared.groovy b/shared.groovy
index 242ca73..1a38f7d 100644
--- a/shared.groovy
+++ b/shared.groovy
@@ -179,7 +179,7 @@ def bootstrapModules(ctx) {
   echo "mods: ${mods}"
   mods = registerMods(mods, ctx.mdRepo, ctx.okapiIp)
   echo "valid mods: ${mods}"
-  deployMods(mods, ctx.okapiIp, ctx.modsIp, ctx.modsPvtIp, ctx.dbPvtIp, ctx.tenant, ctx.sshCmd, ctx.sshUser)
+  deployMods(ctx.envName, mods, ctx.okapiIp, ctx.modsIp, ctx.modsPvtIp, ctx.dbPvtIp, ctx.tenant, ctx.sshCmd, ctx.sshUser)
 }
 
 def populateData(ctx) {
@@ -553,7 +553,7 @@ def registerMods(mods, mdRepo, okapiIp) {
 }
 
 // deploy modules
-def deployMods(mods, okapiIp, modsIp, modsPvtIp, dbPvtIp, tenant, sshCmd, sshUser) {
+def deployMods(envName, mods, okapiIp, modsIp, modsPvtIp, dbPvtIp, tenant, sshCmd, sshUser) {
   def port = 9200
   def modJobTemplate = readFile("config/mods.sh").trim()
   def installTemplate = readFile("config/install.json").trim()
@@ -603,10 +603,18 @@ def deployMods(mods, okapiIp, modsIp, modsPvtIp, dbPvtIp, tenant, sshCmd, sshUse
     if (modName.equals("mod-inventory-storage") ||
     modName.equals("mod-source-record-storage") ||
     modName.equals("mod-ebsconet") ||
-    modName.equals("mod-source-record-manager")) {
+    modName.equals("mod-source-record-manager") ||
+    modName.equals("mod-data-import")) {
       modJob = readFile("config/mod-inventory-storage.sh").trim()
       modJob = modJob.replace('${dbHost}', dbPvtIp)
       modJob = modJob.replace('${okapiIp}', okapiIp)
+      modJob = modJob.replace('${envName}', envName)
+    }
+    // mod-data-import-converter-storage, users has different env variables
+    if (modName.equals("mod-data-import-converter-storage") ||
+    modName.equals("mod-users")) {
+      modJob = readFile("config/mod-data-import-converter-storage.sh").trim()
+      modJob = modJob.replace('${dbHost}', dbPvtIp)
     }
     // mod-bursar-export and mod-password-validator have different env variables
     if (modName.equals("mod-bursar-export") ||

From 922677b77b2db43349f154f659184d89307f4dba Mon Sep 17 00:00:00 2001
From: AlehLitasau <92017954+AlehLitasau@users.noreply.github.com>
Date: Wed, 17 Nov 2021 11:43:16 +0300
Subject: [PATCH 100/153] FAT-969 mod oai-pmh included

---
 shared.groovy | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/shared.groovy b/shared.groovy
index 1a38f7d..80978f0 100644
--- a/shared.groovy
+++ b/shared.groovy
@@ -460,7 +460,7 @@ def getMods(fixedMods, mdRepo) {
     if (mod.id.startsWith("edge-sip2")) {
       continue
     }
-    if (mod.id.startsWith("mod-oa")) {
+    if (mod.id.startsWith("mod-oa-")) {
       continue
     }
     if (mod.id.startsWith("mod-eusage-reports")) {

From 1fc8dba7afd5b53e7d668cdc6e6d346764a2194c Mon Sep 17 00:00:00 2001
From: AlehLitasau <92017954+AlehLitasau@users.noreply.github.com>
Date: Thu, 18 Nov 2021 10:35:41 +0300
Subject: [PATCH 101/153] FAT-969 Change user

---
 shared.groovy | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/shared.groovy b/shared.groovy
index 80978f0..fd9562e 100644
--- a/shared.groovy
+++ b/shared.groovy
@@ -269,7 +269,7 @@ def runNewman(ctx, postmanEnvironment) {
     userRemoteConfigs: [[url: 'https://github.com/folio-org/folio-api-tests.git']]
   ])
   def okapiDns = "ec2-" + ctx.okapiIp.replaceAll(/\./, "-") + ".compute-1.amazonaws.com"
-  def okapiUser="super_admin"
+  def okapiUser="admin"
   def okapiPwd="admin"
   dir("${env.WORKSPACE}/folio-api-tests") {
     withDockerContainer(image: 'postman/newman', args: '--user 0:0 --entrypoint=\'\'') {

From bc9ad59e1d9181733e6d5158f79af4a002bb165a Mon Sep 17 00:00:00 2001
From: Maryia_Lazavik <Maryia_Lazavik@epam.com>
Date: Wed, 22 Dec 2021 13:25:39 +0300
Subject: [PATCH 102/153]  change shared.groovy file regarding FOLIO-2982

---
 shared.groovy | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/shared.groovy b/shared.groovy
index fd9562e..c1db085 100644
--- a/shared.groovy
+++ b/shared.groovy
@@ -341,12 +341,16 @@ def runIntegrationTests(ctx) {
       mavenSettingsConfig: 'folioci-maven-settings'
     ) {
       def okapiDns = "ec2-" + ctx.okapiIp.replaceAll(/\./, "-") + ".compute-1.amazonaws.com"
-      withCredentials([usernamePassword(credentialsId: 'testrail-ut56', passwordVariable: 'testrail_password', usernameVariable: 'testrail_user'), string(credentialsId: 'mod-kb-ebsco-key', variable: 'ebsco_key'), string(credentialsId: 'mod-kb-ebsco-url', variable: 'ebsco_url'), string(credentialsId: 'mod-kb-ebsco-id', variable: 'ebsco_id')]) {
+      withCredentials([usernamePassword(credentialsId: 'testrail-ut56', passwordVariable: 'testrail_password', usernameVariable: 'testrail_user'), string(credentialsId: 'mod-kb-ebsco-key', variable: 'ebsco_key'), string(credentialsId: 'mod-kb-ebsco-url', variable: 'ebsco_url'), string(credentialsId: 'mod-kb-ebsco-id', variable: 'ebsco_id'),
+       string(credentialsId: 'mod-kb-ebsco-usageId', variable: 'ebsco_usage_id'), string(credentialsId: 'mod-kb-ebsco-usageSecret', variable: 'ebsco_usage_secret'), string(credentialsId: 'mod-kb-ebsco-usageKey', variable: 'ebsco_usage_key')]) {
       sh """
       export kbEbscoCredentialsApiKey=${ebsco_key}
       export kbEbscoCredentialsUrl=${ebsco_url}
       export kbEbscoCredentialsCustomerId=${ebsco_id}
-      mvn test -Dkarate.env=${okapiDns} -DfailIfNoTests=false -Dtestrail_url=${TestRailUrl} -Dtestrail_userId=${testrail_user} -Dtestrail_pwd=${testrail_password} -Dtestrail_projectId=${TestRailProjectId} -DkbEbscoCredentialsApiKey=${ebsco_key} -DkbEbscoCredentialsUrl=${ebsco_url} -DkbEbscoCredentialsCustomerId=${ebsco_id}
+      export usageConsolidationCredentialsId =${ebsco_usage_id}
+      export usageConsolidationCredentialsSecret =${ebsco_usage_secret}
+      export usageConsolidationCustomerKey =${ebsco_usage_key}
+      mvn test -Dkarate.env=${okapiDns} -DfailIfNoTests=false -Dtestrail_url=${TestRailUrl} -Dtestrail_userId=${testrail_user} -Dtestrail_pwd=${testrail_password} -Dtestrail_projectId=${TestRailProjectId} -DkbEbscoCredentialsApiKey=${ebsco_key} -DkbEbscoCredentialsUrl=${ebsco_url} -DkbEbscoCredentialsCustomerId=${ebsco_id} -DusageConsolidationCredentialsId =${ebsco_usage_id} -DusageConsolidationCredentialsSecret =${ebsco_usage_secret} -DusageConsolidationCustomerKey =${ebsco_usage_key}
       """
       }
     }

From 176e7747e3505a1b5a4905eceb7c8a74a1c9ff18 Mon Sep 17 00:00:00 2001
From: Maryia_Lazavik <Maryia_Lazavik@epam.com>
Date: Wed, 22 Dec 2021 14:35:34 +0300
Subject: [PATCH 103/153] add for file var

---
 config/mod-kb-ebsco.sh | 2 +-
 shared.groovy          | 3 +--
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/config/mod-kb-ebsco.sh b/config/mod-kb-ebsco.sh
index b760529..d79ac35 100644
--- a/config/mod-kb-ebsco.sh
+++ b/config/mod-kb-ebsco.sh
@@ -1 +1 @@
-docker run -d --rm --name ${modName} -e 'EBSCO_RMAPI_BASE_URL=https://sandbox.ebsco.io' -p${port}:8081 folioci/${modName}:${modVer}
+docker run -d --rm --name ${modName} -e 'EBSCO_RMAPI_BASE_URL=https://sandbox.ebsco.io' -e 'usageConsolidationCredentialsId =${ebsco_usage_id}' -e 'usageConsolidationCredentialsSecret =${ebsco_usage_secret}' -e 'usageConsolidationCustomerKey =${ebsco_usage_key}'   -p${port}:8081 folioci/${modName}:${modVer}
diff --git a/shared.groovy b/shared.groovy
index c1db085..390ac4d 100644
--- a/shared.groovy
+++ b/shared.groovy
@@ -341,8 +341,7 @@ def runIntegrationTests(ctx) {
       mavenSettingsConfig: 'folioci-maven-settings'
     ) {
       def okapiDns = "ec2-" + ctx.okapiIp.replaceAll(/\./, "-") + ".compute-1.amazonaws.com"
-      withCredentials([usernamePassword(credentialsId: 'testrail-ut56', passwordVariable: 'testrail_password', usernameVariable: 'testrail_user'), string(credentialsId: 'mod-kb-ebsco-key', variable: 'ebsco_key'), string(credentialsId: 'mod-kb-ebsco-url', variable: 'ebsco_url'), string(credentialsId: 'mod-kb-ebsco-id', variable: 'ebsco_id'),
-       string(credentialsId: 'mod-kb-ebsco-usageId', variable: 'ebsco_usage_id'), string(credentialsId: 'mod-kb-ebsco-usageSecret', variable: 'ebsco_usage_secret'), string(credentialsId: 'mod-kb-ebsco-usageKey', variable: 'ebsco_usage_key')]) {
+      withCredentials([usernamePassword(credentialsId: 'testrail-ut56', passwordVariable: 'testrail_password', usernameVariable: 'testrail_user'), string(credentialsId: 'mod-kb-ebsco-key', variable: 'ebsco_key'), string(credentialsId: 'mod-kb-ebsco-url', variable: 'ebsco_url'), string(credentialsId: 'mod-kb-ebsco-id', variable: 'ebsco_id'), string(credentialsId: 'mod-kb-ebsco-usageId', variable: 'ebsco_usage_id'), string(credentialsId: 'mod-kb-ebsco-usageSecret', variable: 'ebsco_usage_secret'), string(credentialsId: 'mod-kb-ebsco-usageKey', variable: 'ebsco_usage_key')]) {
       sh """
       export kbEbscoCredentialsApiKey=${ebsco_key}
       export kbEbscoCredentialsUrl=${ebsco_url}

From 4b3f8f2fd8d87618a1c60c276642b3d1cd0fce54 Mon Sep 17 00:00:00 2001
From: Maryia_Lazavik <Maryia_Lazavik@epam.com>
Date: Wed, 22 Dec 2021 14:54:17 +0300
Subject: [PATCH 104/153] fix files

---
 config/mod-kb-ebsco.sh | 2 +-
 shared.groovy          | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/config/mod-kb-ebsco.sh b/config/mod-kb-ebsco.sh
index d79ac35..af06add 100644
--- a/config/mod-kb-ebsco.sh
+++ b/config/mod-kb-ebsco.sh
@@ -1 +1 @@
-docker run -d --rm --name ${modName} -e 'EBSCO_RMAPI_BASE_URL=https://sandbox.ebsco.io' -e 'usageConsolidationCredentialsId =${ebsco_usage_id}' -e 'usageConsolidationCredentialsSecret =${ebsco_usage_secret}' -e 'usageConsolidationCustomerKey =${ebsco_usage_key}'   -p${port}:8081 folioci/${modName}:${modVer}
+docker run -d --rm --name ${modName} -e 'EBSCO_RMAPI_BASE_URL=https://sandbox.ebsco.io'  -p${port}:8081 folioci/${modName}:${modVer}
diff --git a/shared.groovy b/shared.groovy
index 390ac4d..8ebe121 100644
--- a/shared.groovy
+++ b/shared.groovy
@@ -346,9 +346,9 @@ def runIntegrationTests(ctx) {
       export kbEbscoCredentialsApiKey=${ebsco_key}
       export kbEbscoCredentialsUrl=${ebsco_url}
       export kbEbscoCredentialsCustomerId=${ebsco_id}
-      export usageConsolidationCredentialsId =${ebsco_usage_id}
-      export usageConsolidationCredentialsSecret =${ebsco_usage_secret}
-      export usageConsolidationCustomerKey =${ebsco_usage_key}
+      export usageConsolidationCredentialsId=${ebsco_usage_id}
+      export usageConsolidationCredentialsSecret=${ebsco_usage_secret}
+      export usageConsolidationCustomerKey=${ebsco_usage_key}
       mvn test -Dkarate.env=${okapiDns} -DfailIfNoTests=false -Dtestrail_url=${TestRailUrl} -Dtestrail_userId=${testrail_user} -Dtestrail_pwd=${testrail_password} -Dtestrail_projectId=${TestRailProjectId} -DkbEbscoCredentialsApiKey=${ebsco_key} -DkbEbscoCredentialsUrl=${ebsco_url} -DkbEbscoCredentialsCustomerId=${ebsco_id} -DusageConsolidationCredentialsId =${ebsco_usage_id} -DusageConsolidationCredentialsSecret =${ebsco_usage_secret} -DusageConsolidationCustomerKey =${ebsco_usage_key}
       """
       }

From 1fb718aeeb3b5185b86c6f9ba4a2eb9461db20d4 Mon Sep 17 00:00:00 2001
From: Maryia_Lazavik <Maryia_Lazavik@epam.com>
Date: Wed, 22 Dec 2021 17:10:59 +0300
Subject: [PATCH 105/153] fix var

---
 shared.groovy | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/shared.groovy b/shared.groovy
index 8ebe121..00117b8 100644
--- a/shared.groovy
+++ b/shared.groovy
@@ -349,7 +349,7 @@ def runIntegrationTests(ctx) {
       export usageConsolidationCredentialsId=${ebsco_usage_id}
       export usageConsolidationCredentialsSecret=${ebsco_usage_secret}
       export usageConsolidationCustomerKey=${ebsco_usage_key}
-      mvn test -Dkarate.env=${okapiDns} -DfailIfNoTests=false -Dtestrail_url=${TestRailUrl} -Dtestrail_userId=${testrail_user} -Dtestrail_pwd=${testrail_password} -Dtestrail_projectId=${TestRailProjectId} -DkbEbscoCredentialsApiKey=${ebsco_key} -DkbEbscoCredentialsUrl=${ebsco_url} -DkbEbscoCredentialsCustomerId=${ebsco_id} -DusageConsolidationCredentialsId =${ebsco_usage_id} -DusageConsolidationCredentialsSecret =${ebsco_usage_secret} -DusageConsolidationCustomerKey =${ebsco_usage_key}
+      mvn test -Dkarate.env=${okapiDns} -DfailIfNoTests=false -Dtestrail_url=${TestRailUrl} -Dtestrail_userId=${testrail_user} -Dtestrail_pwd=${testrail_password} -Dtestrail_projectId=${TestRailProjectId} -DkbEbscoCredentialsApiKey=${ebsco_key} -DkbEbscoCredentialsUrl=${ebsco_url} -DkbEbscoCredentialsCustomerId=${ebsco_id} -DusageConsolidationCredentialsId=${ebsco_usage_id} -DusageConsolidationCredentialsSecret=${ebsco_usage_secret} -DusageConsolidationCustomerKey=${ebsco_usage_key}
       """
       }
     }

From a910ebb4eb0ab7603abe65bc2a4bdb1acd005d4e Mon Sep 17 00:00:00 2001
From: Maryia_Lazavik <Maryia_Lazavik@epam.com>
Date: Thu, 23 Dec 2021 10:47:21 +0300
Subject: [PATCH 106/153] FOLIO-2982 update mod-kb-ebsco, add variables

---
 shared.groovy | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/shared.groovy b/shared.groovy
index 00117b8..35991f1 100644
--- a/shared.groovy
+++ b/shared.groovy
@@ -366,7 +366,7 @@ def runIntegrationTests(ctx) {
       i=0
       while [ -a "\${path_rep}/\${sname}" ]
         do
-        i=\$(( \$i + 1 ))       
+        i=\$(( \$i + 1 ))
         sname="\${name}_\${i}.\${tp}"
       done
       cp \$file \${path_rep}/\$sname

From 40953a756858aeab2e4ee8fca3e1a8132525463e Mon Sep 17 00:00:00 2001
From: AlehLitasau <92017954+AlehLitasau@users.noreply.github.com>
Date: Thu, 6 Jan 2022 14:55:10 +0300
Subject: [PATCH 107/153] RANCHER-126 Add parametrs to mod-inventory

---
 config/mod-inventory.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/config/mod-inventory.sh b/config/mod-inventory.sh
index 360bb25..5a7503c 100644
--- a/config/mod-inventory.sh
+++ b/config/mod-inventory.sh
@@ -1 +1 @@
-docker run -d --rm --name ${modName} --mount type=bind,source=/tmp/folio-conf,target=/folio-conf -e 'OKAPI_URL=http://${okapiIp}:9130' -e 'KAFKA_HOST=${dbHost}' -e 'KAFKA_PORT=9092' -e 'JAVA_OPTIONS=-Dorg.folio.metadata.inventory.storage.type=okapi' -p${port}:9403 folioci/${modName}:${modVer} db_connection=/folio-conf/pg.json
+docker run -d --rm --name ${modName} --mount type=bind,source=/tmp/folio-conf,target=/folio-conf -e 'DB_HOST=${dbHost}' -e 'DB_PORT=5432' -e 'DB_DATABASE=folio' -e 'DB_USERNAME=folio' -e 'DB_PASSWORD=folioadmin' -e 'OKAPI_URL=http://${okapiIp}:9130' -e 'KAFKA_HOST=${dbHost}' -e 'KAFKA_PORT=9092' -e 'JAVA_OPTIONS=-Dorg.folio.metadata.inventory.storage.type=okapi' -p${port}:9403 folioci/${modName}:${modVer} db_connection=/folio-conf/pg.json

From 641bfb8a90b7e681e8b930283c97c42c3a5d0985 Mon Sep 17 00:00:00 2001
From: AlehLitasau <92017954+AlehLitasau@users.noreply.github.com>
Date: Wed, 19 Jan 2022 15:34:06 +0300
Subject: [PATCH 108/153] FAT-208 Disable ipv6.

---
 Jenkinsfile.integration | 1 +
 shared.groovy           | 9 +++++++++
 2 files changed, 10 insertions(+)

diff --git a/Jenkinsfile.integration b/Jenkinsfile.integration
index 4832f33..6e81d3e 100644
--- a/Jenkinsfile.integration
+++ b/Jenkinsfile.integration
@@ -54,6 +54,7 @@ node('jenkins-agent-java11') {
 
           stage("Wait for Environment") {
           sharedLib.waitForEnv(context)
+          sharedLib.disableipv6(context)
           }
 
           stage("Bootstrap DB") {
diff --git a/shared.groovy b/shared.groovy
index 35991f1..e0e30c5 100644
--- a/shared.groovy
+++ b/shared.groovy
@@ -82,6 +82,15 @@ def waitForEnv(ctx) {
   }
 }
 
+def disableipv6(ctx) {
+  sh "${ctx.sshCmd} -l ${ctx.sshUser} ${ctx.dbIp} sudo sysctl -w net.ipv6.conf.all.disable_ipv6=1"
+  sh "${ctx.sshCmd} -l ${ctx.sshUser} ${ctx.dbIp} sudo sysctl -w net.ipv6.conf.default.disable_ipv6=1"
+  sh "${ctx.sshCmd} -l ${ctx.sshUser} ${ctx.modsIp} sudo sysctl -w net.ipv6.conf.all.disable_ipv6=1"
+  sh "${ctx.sshCmd} -l ${ctx.sshUser} ${ctx.modsIp} sudo sysctl -w net.ipv6.conf.default.disable_ipv6=1"
+  sh "${ctx.sshCmd} -l ${ctx.sshUser} ${ctx.okapiIp} sudo sysctl -w net.ipv6.conf.all.disable_ipv6=1"
+  sh "${ctx.sshCmd} -l ${ctx.sshUser} ${ctx.okapiIp} sudo sysctl -w net.ipv6.conf.default.disable_ipv6=1"
+}
+
 def bootstrapDb(ctx) {
   stopFolioDockers(ctx, ctx.dbIp)
   sh "${ctx.sshCmd} -l ${ctx.sshUser} ${ctx.dbIp} sudo service ecs stop"

From c2be11750fb0a37cef4e8f2979b2cd56c2c8608c Mon Sep 17 00:00:00 2001
From: Maryia_Lazavik <Maryia_Lazavik@epam.com>
Date: Wed, 19 Jan 2022 15:55:48 +0300
Subject: [PATCH 109/153] FAT-208 add disable ipv6 into files config/.sh

---
 config/db.sh                                | 2 +-
 config/elasticsearch.sh                     | 2 +-
 config/mod-bursar-export.sh                 | 2 +-
 config/mod-data-export.sh                   | 2 +-
 config/mod-data-import-converter-storage.sh | 2 +-
 config/mod-data-import.sh                   | 2 +-
 config/mod-erm.sh                           | 2 +-
 config/mod-graphql.sh                       | 2 +-
 config/mod-inn-reach.sh                     | 2 +-
 config/mod-inventory-storage.sh             | 2 +-
 config/mod-inventory.sh                     | 2 +-
 config/mod-kb-ebsco.sh                      | 2 +-
 config/mod-oa.sh                            | 2 +-
 config/mod-pubsub.sh                        | 2 +-
 config/mod-search.sh                        | 2 +-
 config/mod-service-interaction.sh           | 2 +-
 config/mods.sh                              | 2 +-
 config/okapi.sh                             | 2 +-
 18 files changed, 18 insertions(+), 18 deletions(-)

diff --git a/config/db.sh b/config/db.sh
index c752f54..46b221e 100644
--- a/config/db.sh
+++ b/config/db.sh
@@ -1 +1 @@
-docker run -d --rm --name foliodb -e POSTGRES_USER=folio -e POSTGRES_PASSWORD=folioadmin -p5432:5432 postgres:12 -N 1000
+docker run -d --rm --name foliodb --sysctl net.ipv6.conf.all.disable_ipv6=1 -e POSTGRES_USER=folio -e POSTGRES_PASSWORD=folioadmin -p5432:5432 postgres:12 -N 1000
diff --git a/config/elasticsearch.sh b/config/elasticsearch.sh
index 1982404..aac8475 100644
--- a/config/elasticsearch.sh
+++ b/config/elasticsearch.sh
@@ -1 +1 @@
-docker run -d --name elasticsearch -p 9200:9200 -p 9300:9300 -e "discovery.type=single-node" -e "ELASTIC_PASSWORD=s3cret" docker.dev.folio.org/folio-elasticsearch:7.10.1
+docker run -d --name elasticsearch --sysctl net.ipv6.conf.all.disable_ipv6=1 -p 9200:9200 -p 9300:9300 -e "discovery.type=single-node" -e "ELASTIC_PASSWORD=s3cret" docker.dev.folio.org/folio-elasticsearch:7.10.1
diff --git a/config/mod-bursar-export.sh b/config/mod-bursar-export.sh
index da26faa..91b107f 100644
--- a/config/mod-bursar-export.sh
+++ b/config/mod-bursar-export.sh
@@ -1 +1 @@
-docker run -d --rm --name ${modName} --mount type=bind,source=/tmp/folio-conf,target=/folio-conf -e 'DB_HOST=${dbHost}' -e 'DB_PORT=5432' -e 'DB_DATABASE=folio' -e 'DB_USERNAME=folio' -e 'DB_PASSWORD=folioadmin' -p${port}:8081 folioci/${modName}:${modVer}
\ No newline at end of file
+docker run -d --rm --name ${modName} --sysctl net.ipv6.conf.all.disable_ipv6=1 --mount type=bind,source=/tmp/folio-conf,target=/folio-conf -e 'DB_HOST=${dbHost}' -e 'DB_PORT=5432' -e 'DB_DATABASE=folio' -e 'DB_USERNAME=folio' -e 'DB_PASSWORD=folioadmin' -p${port}:8081 folioci/${modName}:${modVer}
\ No newline at end of file
diff --git a/config/mod-data-export.sh b/config/mod-data-export.sh
index 236a2d0..131ba0b 100644
--- a/config/mod-data-export.sh
+++ b/config/mod-data-export.sh
@@ -1 +1 @@
-docker run -d --rm --name ${modName} --mount type=bind,source=/tmp/folio-conf,target=/folio-conf -e JAVA_OPTIONS=\'-Dorg.folio.metadata.inventory.storage.type=okapi -Daws.region=us-west-2 -Daws.accessKeyId=${AWS_ACCESS_KEY_ID} -Daws.secretKey=${AWS_SECRET_ACCESS_KEY} -Dbucket.name=folio-concorde\' -p${port}:8081 folioci/${modName}:${modVer} db_connection=/folio-conf/pg.json
+docker run -d --rm --name ${modName} --sysctl net.ipv6.conf.all.disable_ipv6=1 --mount type=bind,source=/tmp/folio-conf,target=/folio-conf -e JAVA_OPTIONS=\'-Dorg.folio.metadata.inventory.storage.type=okapi -Daws.region=us-west-2 -Daws.accessKeyId=${AWS_ACCESS_KEY_ID} -Daws.secretKey=${AWS_SECRET_ACCESS_KEY} -Dbucket.name=folio-concorde\' -p${port}:8081 folioci/${modName}:${modVer} db_connection=/folio-conf/pg.json
diff --git a/config/mod-data-import-converter-storage.sh b/config/mod-data-import-converter-storage.sh
index 7085efc..60b7e20 100644
--- a/config/mod-data-import-converter-storage.sh
+++ b/config/mod-data-import-converter-storage.sh
@@ -1 +1 @@
-docker run -d --rm --name ${modName} --mount type=bind,source=/tmp/folio-conf,target=/folio-conf -e 'DB_HOST=${dbHost}' -e 'DB_PORT=5432' -e 'DB_DATABASE=folio' -e 'DB_USERNAME=folio' -e 'DB_PASSWORD=folioadmin' -e 'JAVA_OPTIONS=-Dorg.folio.metadata.inventory.storage.type=okapi' -p${port}:8081 folioci/${modName}:${modVer} db_connection=/folio-conf/pg.json
+docker run -d --rm --name ${modName} --sysctl net.ipv6.conf.all.disable_ipv6=1 --mount type=bind,source=/tmp/folio-conf,target=/folio-conf -e 'DB_HOST=${dbHost}' -e 'DB_PORT=5432' -e 'DB_DATABASE=folio' -e 'DB_USERNAME=folio' -e 'DB_PASSWORD=folioadmin' -e 'JAVA_OPTIONS=-Dorg.folio.metadata.inventory.storage.type=okapi' -p${port}:8081 folioci/${modName}:${modVer} db_connection=/folio-conf/pg.json
diff --git a/config/mod-data-import.sh b/config/mod-data-import.sh
index 9a2587a..f6a7af2 100644
--- a/config/mod-data-import.sh
+++ b/config/mod-data-import.sh
@@ -1 +1 @@
-docker run -d --rm --name ${modName} --mount type=bind,source=/tmp/folio-conf,target=/folio-conf -e 'OKAPI_URL=http://${okapiIp}:9130' -e 'KAFKA_HOST=${dbHost}' -e 'KAFKA_PORT=9092' -e 'ENV=${envName}' -e 'JAVA_OPTIONS=-Dorg.folio.metadata.inventory.storage.type=okapi' -p${port}:8081 folioci/${modName}:${modVer} db_connection=/folio-conf/pg.json
+docker run -d --rm --name ${modName} --sysctl net.ipv6.conf.all.disable_ipv6=1 --mount type=bind,source=/tmp/folio-conf,target=/folio-conf -e 'OKAPI_URL=http://${okapiIp}:9130' -e 'KAFKA_HOST=${dbHost}' -e 'KAFKA_PORT=9092' -e 'ENV=${envName}' -e 'JAVA_OPTIONS=-Dorg.folio.metadata.inventory.storage.type=okapi' -p${port}:8081 folioci/${modName}:${modVer} db_connection=/folio-conf/pg.json
diff --git a/config/mod-erm.sh b/config/mod-erm.sh
index 493f07c..4d61c7d 100644
--- a/config/mod-erm.sh
+++ b/config/mod-erm.sh
@@ -1 +1 @@
-docker run -d --name ${modName} -e 'DB_HOST=${dbHost}' -e 'DB_PORT=5432' -e 'DB_DATABASE=folio' -e 'DB_USERNAME=folio' -e 'DB_PASSWORD=folioadmin' -p${port}:8080 folioci/${modName}:${modVer}
+docker run -d --name ${modName} --sysctl net.ipv6.conf.all.disable_ipv6=1 -e 'DB_HOST=${dbHost}' -e 'DB_PORT=5432' -e 'DB_DATABASE=folio' -e 'DB_USERNAME=folio' -e 'DB_PASSWORD=folioadmin' -p${port}:8080 folioci/${modName}:${modVer}
diff --git a/config/mod-graphql.sh b/config/mod-graphql.sh
index 6cb19a8..4366da6 100644
--- a/config/mod-graphql.sh
+++ b/config/mod-graphql.sh
@@ -1 +1 @@
-docker run -d --rm --name ${modName} -p${port}:3001 folioci/${modName}:${modVer}
+docker run -d --rm --name ${modName} --sysctl net.ipv6.conf.all.disable_ipv6=1 -p${port}:3001 folioci/${modName}:${modVer}
diff --git a/config/mod-inn-reach.sh b/config/mod-inn-reach.sh
index 7085efc..60b7e20 100644
--- a/config/mod-inn-reach.sh
+++ b/config/mod-inn-reach.sh
@@ -1 +1 @@
-docker run -d --rm --name ${modName} --mount type=bind,source=/tmp/folio-conf,target=/folio-conf -e 'DB_HOST=${dbHost}' -e 'DB_PORT=5432' -e 'DB_DATABASE=folio' -e 'DB_USERNAME=folio' -e 'DB_PASSWORD=folioadmin' -e 'JAVA_OPTIONS=-Dorg.folio.metadata.inventory.storage.type=okapi' -p${port}:8081 folioci/${modName}:${modVer} db_connection=/folio-conf/pg.json
+docker run -d --rm --name ${modName} --sysctl net.ipv6.conf.all.disable_ipv6=1 --mount type=bind,source=/tmp/folio-conf,target=/folio-conf -e 'DB_HOST=${dbHost}' -e 'DB_PORT=5432' -e 'DB_DATABASE=folio' -e 'DB_USERNAME=folio' -e 'DB_PASSWORD=folioadmin' -e 'JAVA_OPTIONS=-Dorg.folio.metadata.inventory.storage.type=okapi' -p${port}:8081 folioci/${modName}:${modVer} db_connection=/folio-conf/pg.json
diff --git a/config/mod-inventory-storage.sh b/config/mod-inventory-storage.sh
index 232bc6a..c4c44e3 100644
--- a/config/mod-inventory-storage.sh
+++ b/config/mod-inventory-storage.sh
@@ -1 +1 @@
-docker run -d --rm --name ${modName} --mount type=bind,source=/tmp/folio-conf,target=/folio-conf -e 'OKAPI_URL=http://${okapiIp}:9130' -e 'ENV=${envName}' -e 'DB_HOST=${dbHost}' -e 'DB_PORT=5432' -e 'DB_DATABASE=folio' -e 'DB_USERNAME=folio' -e 'DB_PASSWORD=folioadmin' -e 'KAFKA_HOST=${dbHost}' -e 'KAFKA_PORT=9092' -e 'JAVA_OPTIONS=-Dorg.folio.metadata.inventory.storage.type=okapi' -p${port}:8081 folioci/${modName}:${modVer} db_connection=/folio-conf/pg.json 
+docker run -d --rm --name ${modName} --sysctl net.ipv6.conf.all.disable_ipv6=1 --mount type=bind,source=/tmp/folio-conf,target=/folio-conf -e 'OKAPI_URL=http://${okapiIp}:9130' -e 'ENV=${envName}' -e 'DB_HOST=${dbHost}' -e 'DB_PORT=5432' -e 'DB_DATABASE=folio' -e 'DB_USERNAME=folio' -e 'DB_PASSWORD=folioadmin' -e 'KAFKA_HOST=${dbHost}' -e 'KAFKA_PORT=9092' -e 'JAVA_OPTIONS=-Dorg.folio.metadata.inventory.storage.type=okapi' -p${port}:8081 folioci/${modName}:${modVer} db_connection=/folio-conf/pg.json 
diff --git a/config/mod-inventory.sh b/config/mod-inventory.sh
index 5a7503c..9ac854c 100644
--- a/config/mod-inventory.sh
+++ b/config/mod-inventory.sh
@@ -1 +1 @@
-docker run -d --rm --name ${modName} --mount type=bind,source=/tmp/folio-conf,target=/folio-conf -e 'DB_HOST=${dbHost}' -e 'DB_PORT=5432' -e 'DB_DATABASE=folio' -e 'DB_USERNAME=folio' -e 'DB_PASSWORD=folioadmin' -e 'OKAPI_URL=http://${okapiIp}:9130' -e 'KAFKA_HOST=${dbHost}' -e 'KAFKA_PORT=9092' -e 'JAVA_OPTIONS=-Dorg.folio.metadata.inventory.storage.type=okapi' -p${port}:9403 folioci/${modName}:${modVer} db_connection=/folio-conf/pg.json
+docker run -d --rm --name ${modName} --sysctl net.ipv6.conf.all.disable_ipv6=1 --mount type=bind,source=/tmp/folio-conf,target=/folio-conf -e 'DB_HOST=${dbHost}' -e 'DB_PORT=5432' -e 'DB_DATABASE=folio' -e 'DB_USERNAME=folio' -e 'DB_PASSWORD=folioadmin' -e 'OKAPI_URL=http://${okapiIp}:9130' -e 'KAFKA_HOST=${dbHost}' -e 'KAFKA_PORT=9092' -e 'JAVA_OPTIONS=-Dorg.folio.metadata.inventory.storage.type=okapi' -p${port}:9403 folioci/${modName}:${modVer} db_connection=/folio-conf/pg.json
diff --git a/config/mod-kb-ebsco.sh b/config/mod-kb-ebsco.sh
index af06add..ebc00a8 100644
--- a/config/mod-kb-ebsco.sh
+++ b/config/mod-kb-ebsco.sh
@@ -1 +1 @@
-docker run -d --rm --name ${modName} -e 'EBSCO_RMAPI_BASE_URL=https://sandbox.ebsco.io'  -p${port}:8081 folioci/${modName}:${modVer}
+docker run -d --rm --name ${modName} --sysctl net.ipv6.conf.all.disable_ipv6=1 -e 'EBSCO_RMAPI_BASE_URL=https://sandbox.ebsco.io'  -p${port}:8081 folioci/${modName}:${modVer}
diff --git a/config/mod-oa.sh b/config/mod-oa.sh
index edcffee..57c03a9 100644
--- a/config/mod-oa.sh
+++ b/config/mod-oa.sh
@@ -1 +1 @@
-docker run -d --rm --name ${modName} -e 'OKAPI_SERVICE_PORT=9130' -e 'OKAPI_SERVICE_HOST=${okapiIp}' -e 'JAVA_OPTIONS="-server -XX:+UseContainerSupport -XX:MaxRAMPercentage=55.0 -XX:+PrintFlagsFinal"' -p${port}:8080 folioci/${modName}:${modVer}
+docker run -d --rm --name ${modName} --sysctl net.ipv6.conf.all.disable_ipv6=1 -e 'OKAPI_SERVICE_PORT=9130' -e 'OKAPI_SERVICE_HOST=${okapiIp}' -e 'JAVA_OPTIONS="-server -XX:+UseContainerSupport -XX:MaxRAMPercentage=55.0 -XX:+PrintFlagsFinal"' -p${port}:8080 folioci/${modName}:${modVer}
diff --git a/config/mod-pubsub.sh b/config/mod-pubsub.sh
index e87bb70..891af58 100644
--- a/config/mod-pubsub.sh
+++ b/config/mod-pubsub.sh
@@ -1 +1 @@
-docker run -d --rm --name ${modName} -e 'DB_HOST=${dbHost}' -e 'DB_PORT=5432' -e 'DB_DATABASE=folio' -e 'DB_USERNAME=folio' -e 'DB_PASSWORD=folioadmin' -e 'KAFKA_HOST=${dbHost}' -e 'KAFKA_PORT=9092' -e 'OKAPI_URL=http://${okapiIp}:9130' -p${port}:8081 folioci/${modName}:${modVer}
+docker run -d --rm --name ${modName} --sysctl net.ipv6.conf.all.disable_ipv6=1 -e 'DB_HOST=${dbHost}' -e 'DB_PORT=5432' -e 'DB_DATABASE=folio' -e 'DB_USERNAME=folio' -e 'DB_PASSWORD=folioadmin' -e 'KAFKA_HOST=${dbHost}' -e 'KAFKA_PORT=9092' -e 'OKAPI_URL=http://${okapiIp}:9130' -p${port}:8081 folioci/${modName}:${modVer}
diff --git a/config/mod-search.sh b/config/mod-search.sh
index 890a110..2403c95 100644
--- a/config/mod-search.sh
+++ b/config/mod-search.sh
@@ -1 +1 @@
-docker run -d --rm --name ${modName} -e 'DB_HOST=${dbHost}' -e 'ENV=folio' -e 'DB_PORT=5432' -e 'DB_DATABASE=folio' -e 'DB_USERNAME=folio' -e 'DB_PASSWORD=folioadmin' -e 'KAFKA_HOST=${dbHost}' -e 'KAFKA_PORT=9092' -e 'ELASTICSEARCH_HOST=${dbHost}' -e 'ELASTICSEARCH_PASSWORD=s3cret' -e 'OKAPI_URL=http://${okapiIp}:9130' -p${port}:8081 folioci/${modName}:${modVer}
+docker run -d --rm --name ${modName} --sysctl net.ipv6.conf.all.disable_ipv6=1 -e 'DB_HOST=${dbHost}' -e 'ENV=folio' -e 'DB_PORT=5432' -e 'DB_DATABASE=folio' -e 'DB_USERNAME=folio' -e 'DB_PASSWORD=folioadmin' -e 'KAFKA_HOST=${dbHost}' -e 'KAFKA_PORT=9092' -e 'ELASTICSEARCH_HOST=${dbHost}' -e 'ELASTICSEARCH_PASSWORD=s3cret' -e 'OKAPI_URL=http://${okapiIp}:9130' -p${port}:8081 folioci/${modName}:${modVer}
diff --git a/config/mod-service-interaction.sh b/config/mod-service-interaction.sh
index cee9424..1a5f4ad 100644
--- a/config/mod-service-interaction.sh
+++ b/config/mod-service-interaction.sh
@@ -1 +1 @@
-docker run -d --rm --name ${modName} --mount type=bind,source=/tmp/folio-conf,target=/folio-conf -e 'JAVA_OPTIONS=-Dorg.folio.metadata.inventory.storage.type=okapi' -p${port}:8081 folioci/mod-courses:1.2.3-SNAPSHOT.117 db_connection=/folio-conf/pg.json
+docker run -d --rm --name ${modName} --sysctl net.ipv6.conf.all.disable_ipv6=1 --mount type=bind,source=/tmp/folio-conf,target=/folio-conf -e 'JAVA_OPTIONS=-Dorg.folio.metadata.inventory.storage.type=okapi' -p${port}:8081 folioci/mod-courses:1.2.3-SNAPSHOT.117 db_connection=/folio-conf/pg.json
diff --git a/config/mods.sh b/config/mods.sh
index 61f61f7..bbdee7b 100644
--- a/config/mods.sh
+++ b/config/mods.sh
@@ -1 +1 @@
-docker run -d --name ${modName} --mount type=bind,source=/tmp/folio-conf,target=/folio-conf -e 'JAVA_OPTIONS=-Dorg.folio.metadata.inventory.storage.type=okapi' -p${port}:8081 folioci/${modName}:${modVer} db_connection=/folio-conf/pg.json
+docker run -d --name ${modName} --sysctl net.ipv6.conf.all.disable_ipv6=1 --mount type=bind,source=/tmp/folio-conf,target=/folio-conf -e 'JAVA_OPTIONS=-Dorg.folio.metadata.inventory.storage.type=okapi' -p${port}:8081 folioci/${modName}:${modVer} db_connection=/folio-conf/pg.json
diff --git a/config/okapi.sh b/config/okapi.sh
index 2b6c8b3..5648245 100644
--- a/config/okapi.sh
+++ b/config/okapi.sh
@@ -1 +1 @@
-docker run -d --rm --name okapi -e 'JAVA_OPTIONS=-Dokapiurl=http://${okapiPvtIp}:9130 -Dstorage=postgres -Dpostgres_host=${dbPvtIp} -Dpostgres_port=5432 -Dpostgres_user=folio -Dpostgres_password=folioadmin -Dpostgres_database=folio' -p9130:9130 folioorg/okapi:${okapiVersion} cluster
+docker run -d --rm --name okapi --sysctl net.ipv6.conf.all.disable_ipv6=1 -e 'JAVA_OPTIONS=-Dokapiurl=http://${okapiPvtIp}:9130 -Dstorage=postgres -Dpostgres_host=${dbPvtIp} -Dpostgres_port=5432 -Dpostgres_user=folio -Dpostgres_password=folioadmin -Dpostgres_database=folio' -p9130:9130 folioorg/okapi:${okapiVersion} cluster

From 2042402acbc8060e50879949eb9b5dc7b14ac649 Mon Sep 17 00:00:00 2001
From: AlehLitasau <92017954+AlehLitasau@users.noreply.github.com>
Date: Thu, 20 Jan 2022 12:28:56 +0300
Subject: [PATCH 110/153] RANCHER-146 Temp adjust mod instance to avoid OOM

---
 cloudformation/folio.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/cloudformation/folio.yml b/cloudformation/folio.yml
index 20f5209..a950bd6 100644
--- a/cloudformation/folio.yml
+++ b/cloudformation/folio.yml
@@ -27,7 +27,7 @@ Parameters:
   InstanceTypeMods:
     Description: EC2 instance type for backend modules server
     Type: String
-    Default: m5.2xlarge
+    Default: m5.4xlarge
   InstanceTypeDb:
     Description: EC2 instance type for database server
     Type: String

From a3c53b4409d9e23c4740d7e33e68563a05d74e42 Mon Sep 17 00:00:00 2001
From: Maryia_Lazavik <Maryia_Lazavik@epam.com>
Date: Fri, 21 Jan 2022 15:50:41 +0300
Subject: [PATCH 111/153] Revert "FAT-208 add disable ipv6 into files
 config/.sh"

This reverts commit c2be11750fb0a37cef4e8f2979b2cd56c2c8608c.
---
 config/db.sh                                | 2 +-
 config/elasticsearch.sh                     | 2 +-
 config/mod-bursar-export.sh                 | 2 +-
 config/mod-data-export.sh                   | 2 +-
 config/mod-data-import-converter-storage.sh | 2 +-
 config/mod-data-import.sh                   | 2 +-
 config/mod-erm.sh                           | 2 +-
 config/mod-graphql.sh                       | 2 +-
 config/mod-inn-reach.sh                     | 2 +-
 config/mod-inventory-storage.sh             | 2 +-
 config/mod-inventory.sh                     | 2 +-
 config/mod-kb-ebsco.sh                      | 2 +-
 config/mod-oa.sh                            | 2 +-
 config/mod-pubsub.sh                        | 2 +-
 config/mod-search.sh                        | 2 +-
 config/mod-service-interaction.sh           | 2 +-
 config/mods.sh                              | 2 +-
 config/okapi.sh                             | 2 +-
 18 files changed, 18 insertions(+), 18 deletions(-)

diff --git a/config/db.sh b/config/db.sh
index 46b221e..c752f54 100644
--- a/config/db.sh
+++ b/config/db.sh
@@ -1 +1 @@
-docker run -d --rm --name foliodb --sysctl net.ipv6.conf.all.disable_ipv6=1 -e POSTGRES_USER=folio -e POSTGRES_PASSWORD=folioadmin -p5432:5432 postgres:12 -N 1000
+docker run -d --rm --name foliodb -e POSTGRES_USER=folio -e POSTGRES_PASSWORD=folioadmin -p5432:5432 postgres:12 -N 1000
diff --git a/config/elasticsearch.sh b/config/elasticsearch.sh
index aac8475..1982404 100644
--- a/config/elasticsearch.sh
+++ b/config/elasticsearch.sh
@@ -1 +1 @@
-docker run -d --name elasticsearch --sysctl net.ipv6.conf.all.disable_ipv6=1 -p 9200:9200 -p 9300:9300 -e "discovery.type=single-node" -e "ELASTIC_PASSWORD=s3cret" docker.dev.folio.org/folio-elasticsearch:7.10.1
+docker run -d --name elasticsearch -p 9200:9200 -p 9300:9300 -e "discovery.type=single-node" -e "ELASTIC_PASSWORD=s3cret" docker.dev.folio.org/folio-elasticsearch:7.10.1
diff --git a/config/mod-bursar-export.sh b/config/mod-bursar-export.sh
index 91b107f..da26faa 100644
--- a/config/mod-bursar-export.sh
+++ b/config/mod-bursar-export.sh
@@ -1 +1 @@
-docker run -d --rm --name ${modName} --sysctl net.ipv6.conf.all.disable_ipv6=1 --mount type=bind,source=/tmp/folio-conf,target=/folio-conf -e 'DB_HOST=${dbHost}' -e 'DB_PORT=5432' -e 'DB_DATABASE=folio' -e 'DB_USERNAME=folio' -e 'DB_PASSWORD=folioadmin' -p${port}:8081 folioci/${modName}:${modVer}
\ No newline at end of file
+docker run -d --rm --name ${modName} --mount type=bind,source=/tmp/folio-conf,target=/folio-conf -e 'DB_HOST=${dbHost}' -e 'DB_PORT=5432' -e 'DB_DATABASE=folio' -e 'DB_USERNAME=folio' -e 'DB_PASSWORD=folioadmin' -p${port}:8081 folioci/${modName}:${modVer}
\ No newline at end of file
diff --git a/config/mod-data-export.sh b/config/mod-data-export.sh
index 131ba0b..236a2d0 100644
--- a/config/mod-data-export.sh
+++ b/config/mod-data-export.sh
@@ -1 +1 @@
-docker run -d --rm --name ${modName} --sysctl net.ipv6.conf.all.disable_ipv6=1 --mount type=bind,source=/tmp/folio-conf,target=/folio-conf -e JAVA_OPTIONS=\'-Dorg.folio.metadata.inventory.storage.type=okapi -Daws.region=us-west-2 -Daws.accessKeyId=${AWS_ACCESS_KEY_ID} -Daws.secretKey=${AWS_SECRET_ACCESS_KEY} -Dbucket.name=folio-concorde\' -p${port}:8081 folioci/${modName}:${modVer} db_connection=/folio-conf/pg.json
+docker run -d --rm --name ${modName} --mount type=bind,source=/tmp/folio-conf,target=/folio-conf -e JAVA_OPTIONS=\'-Dorg.folio.metadata.inventory.storage.type=okapi -Daws.region=us-west-2 -Daws.accessKeyId=${AWS_ACCESS_KEY_ID} -Daws.secretKey=${AWS_SECRET_ACCESS_KEY} -Dbucket.name=folio-concorde\' -p${port}:8081 folioci/${modName}:${modVer} db_connection=/folio-conf/pg.json
diff --git a/config/mod-data-import-converter-storage.sh b/config/mod-data-import-converter-storage.sh
index 60b7e20..7085efc 100644
--- a/config/mod-data-import-converter-storage.sh
+++ b/config/mod-data-import-converter-storage.sh
@@ -1 +1 @@
-docker run -d --rm --name ${modName} --sysctl net.ipv6.conf.all.disable_ipv6=1 --mount type=bind,source=/tmp/folio-conf,target=/folio-conf -e 'DB_HOST=${dbHost}' -e 'DB_PORT=5432' -e 'DB_DATABASE=folio' -e 'DB_USERNAME=folio' -e 'DB_PASSWORD=folioadmin' -e 'JAVA_OPTIONS=-Dorg.folio.metadata.inventory.storage.type=okapi' -p${port}:8081 folioci/${modName}:${modVer} db_connection=/folio-conf/pg.json
+docker run -d --rm --name ${modName} --mount type=bind,source=/tmp/folio-conf,target=/folio-conf -e 'DB_HOST=${dbHost}' -e 'DB_PORT=5432' -e 'DB_DATABASE=folio' -e 'DB_USERNAME=folio' -e 'DB_PASSWORD=folioadmin' -e 'JAVA_OPTIONS=-Dorg.folio.metadata.inventory.storage.type=okapi' -p${port}:8081 folioci/${modName}:${modVer} db_connection=/folio-conf/pg.json
diff --git a/config/mod-data-import.sh b/config/mod-data-import.sh
index f6a7af2..9a2587a 100644
--- a/config/mod-data-import.sh
+++ b/config/mod-data-import.sh
@@ -1 +1 @@
-docker run -d --rm --name ${modName} --sysctl net.ipv6.conf.all.disable_ipv6=1 --mount type=bind,source=/tmp/folio-conf,target=/folio-conf -e 'OKAPI_URL=http://${okapiIp}:9130' -e 'KAFKA_HOST=${dbHost}' -e 'KAFKA_PORT=9092' -e 'ENV=${envName}' -e 'JAVA_OPTIONS=-Dorg.folio.metadata.inventory.storage.type=okapi' -p${port}:8081 folioci/${modName}:${modVer} db_connection=/folio-conf/pg.json
+docker run -d --rm --name ${modName} --mount type=bind,source=/tmp/folio-conf,target=/folio-conf -e 'OKAPI_URL=http://${okapiIp}:9130' -e 'KAFKA_HOST=${dbHost}' -e 'KAFKA_PORT=9092' -e 'ENV=${envName}' -e 'JAVA_OPTIONS=-Dorg.folio.metadata.inventory.storage.type=okapi' -p${port}:8081 folioci/${modName}:${modVer} db_connection=/folio-conf/pg.json
diff --git a/config/mod-erm.sh b/config/mod-erm.sh
index 4d61c7d..493f07c 100644
--- a/config/mod-erm.sh
+++ b/config/mod-erm.sh
@@ -1 +1 @@
-docker run -d --name ${modName} --sysctl net.ipv6.conf.all.disable_ipv6=1 -e 'DB_HOST=${dbHost}' -e 'DB_PORT=5432' -e 'DB_DATABASE=folio' -e 'DB_USERNAME=folio' -e 'DB_PASSWORD=folioadmin' -p${port}:8080 folioci/${modName}:${modVer}
+docker run -d --name ${modName} -e 'DB_HOST=${dbHost}' -e 'DB_PORT=5432' -e 'DB_DATABASE=folio' -e 'DB_USERNAME=folio' -e 'DB_PASSWORD=folioadmin' -p${port}:8080 folioci/${modName}:${modVer}
diff --git a/config/mod-graphql.sh b/config/mod-graphql.sh
index 4366da6..6cb19a8 100644
--- a/config/mod-graphql.sh
+++ b/config/mod-graphql.sh
@@ -1 +1 @@
-docker run -d --rm --name ${modName} --sysctl net.ipv6.conf.all.disable_ipv6=1 -p${port}:3001 folioci/${modName}:${modVer}
+docker run -d --rm --name ${modName} -p${port}:3001 folioci/${modName}:${modVer}
diff --git a/config/mod-inn-reach.sh b/config/mod-inn-reach.sh
index 60b7e20..7085efc 100644
--- a/config/mod-inn-reach.sh
+++ b/config/mod-inn-reach.sh
@@ -1 +1 @@
-docker run -d --rm --name ${modName} --sysctl net.ipv6.conf.all.disable_ipv6=1 --mount type=bind,source=/tmp/folio-conf,target=/folio-conf -e 'DB_HOST=${dbHost}' -e 'DB_PORT=5432' -e 'DB_DATABASE=folio' -e 'DB_USERNAME=folio' -e 'DB_PASSWORD=folioadmin' -e 'JAVA_OPTIONS=-Dorg.folio.metadata.inventory.storage.type=okapi' -p${port}:8081 folioci/${modName}:${modVer} db_connection=/folio-conf/pg.json
+docker run -d --rm --name ${modName} --mount type=bind,source=/tmp/folio-conf,target=/folio-conf -e 'DB_HOST=${dbHost}' -e 'DB_PORT=5432' -e 'DB_DATABASE=folio' -e 'DB_USERNAME=folio' -e 'DB_PASSWORD=folioadmin' -e 'JAVA_OPTIONS=-Dorg.folio.metadata.inventory.storage.type=okapi' -p${port}:8081 folioci/${modName}:${modVer} db_connection=/folio-conf/pg.json
diff --git a/config/mod-inventory-storage.sh b/config/mod-inventory-storage.sh
index c4c44e3..232bc6a 100644
--- a/config/mod-inventory-storage.sh
+++ b/config/mod-inventory-storage.sh
@@ -1 +1 @@
-docker run -d --rm --name ${modName} --sysctl net.ipv6.conf.all.disable_ipv6=1 --mount type=bind,source=/tmp/folio-conf,target=/folio-conf -e 'OKAPI_URL=http://${okapiIp}:9130' -e 'ENV=${envName}' -e 'DB_HOST=${dbHost}' -e 'DB_PORT=5432' -e 'DB_DATABASE=folio' -e 'DB_USERNAME=folio' -e 'DB_PASSWORD=folioadmin' -e 'KAFKA_HOST=${dbHost}' -e 'KAFKA_PORT=9092' -e 'JAVA_OPTIONS=-Dorg.folio.metadata.inventory.storage.type=okapi' -p${port}:8081 folioci/${modName}:${modVer} db_connection=/folio-conf/pg.json 
+docker run -d --rm --name ${modName} --mount type=bind,source=/tmp/folio-conf,target=/folio-conf -e 'OKAPI_URL=http://${okapiIp}:9130' -e 'ENV=${envName}' -e 'DB_HOST=${dbHost}' -e 'DB_PORT=5432' -e 'DB_DATABASE=folio' -e 'DB_USERNAME=folio' -e 'DB_PASSWORD=folioadmin' -e 'KAFKA_HOST=${dbHost}' -e 'KAFKA_PORT=9092' -e 'JAVA_OPTIONS=-Dorg.folio.metadata.inventory.storage.type=okapi' -p${port}:8081 folioci/${modName}:${modVer} db_connection=/folio-conf/pg.json 
diff --git a/config/mod-inventory.sh b/config/mod-inventory.sh
index 9ac854c..5a7503c 100644
--- a/config/mod-inventory.sh
+++ b/config/mod-inventory.sh
@@ -1 +1 @@
-docker run -d --rm --name ${modName} --sysctl net.ipv6.conf.all.disable_ipv6=1 --mount type=bind,source=/tmp/folio-conf,target=/folio-conf -e 'DB_HOST=${dbHost}' -e 'DB_PORT=5432' -e 'DB_DATABASE=folio' -e 'DB_USERNAME=folio' -e 'DB_PASSWORD=folioadmin' -e 'OKAPI_URL=http://${okapiIp}:9130' -e 'KAFKA_HOST=${dbHost}' -e 'KAFKA_PORT=9092' -e 'JAVA_OPTIONS=-Dorg.folio.metadata.inventory.storage.type=okapi' -p${port}:9403 folioci/${modName}:${modVer} db_connection=/folio-conf/pg.json
+docker run -d --rm --name ${modName} --mount type=bind,source=/tmp/folio-conf,target=/folio-conf -e 'DB_HOST=${dbHost}' -e 'DB_PORT=5432' -e 'DB_DATABASE=folio' -e 'DB_USERNAME=folio' -e 'DB_PASSWORD=folioadmin' -e 'OKAPI_URL=http://${okapiIp}:9130' -e 'KAFKA_HOST=${dbHost}' -e 'KAFKA_PORT=9092' -e 'JAVA_OPTIONS=-Dorg.folio.metadata.inventory.storage.type=okapi' -p${port}:9403 folioci/${modName}:${modVer} db_connection=/folio-conf/pg.json
diff --git a/config/mod-kb-ebsco.sh b/config/mod-kb-ebsco.sh
index ebc00a8..af06add 100644
--- a/config/mod-kb-ebsco.sh
+++ b/config/mod-kb-ebsco.sh
@@ -1 +1 @@
-docker run -d --rm --name ${modName} --sysctl net.ipv6.conf.all.disable_ipv6=1 -e 'EBSCO_RMAPI_BASE_URL=https://sandbox.ebsco.io'  -p${port}:8081 folioci/${modName}:${modVer}
+docker run -d --rm --name ${modName} -e 'EBSCO_RMAPI_BASE_URL=https://sandbox.ebsco.io'  -p${port}:8081 folioci/${modName}:${modVer}
diff --git a/config/mod-oa.sh b/config/mod-oa.sh
index 57c03a9..edcffee 100644
--- a/config/mod-oa.sh
+++ b/config/mod-oa.sh
@@ -1 +1 @@
-docker run -d --rm --name ${modName} --sysctl net.ipv6.conf.all.disable_ipv6=1 -e 'OKAPI_SERVICE_PORT=9130' -e 'OKAPI_SERVICE_HOST=${okapiIp}' -e 'JAVA_OPTIONS="-server -XX:+UseContainerSupport -XX:MaxRAMPercentage=55.0 -XX:+PrintFlagsFinal"' -p${port}:8080 folioci/${modName}:${modVer}
+docker run -d --rm --name ${modName} -e 'OKAPI_SERVICE_PORT=9130' -e 'OKAPI_SERVICE_HOST=${okapiIp}' -e 'JAVA_OPTIONS="-server -XX:+UseContainerSupport -XX:MaxRAMPercentage=55.0 -XX:+PrintFlagsFinal"' -p${port}:8080 folioci/${modName}:${modVer}
diff --git a/config/mod-pubsub.sh b/config/mod-pubsub.sh
index 891af58..e87bb70 100644
--- a/config/mod-pubsub.sh
+++ b/config/mod-pubsub.sh
@@ -1 +1 @@
-docker run -d --rm --name ${modName} --sysctl net.ipv6.conf.all.disable_ipv6=1 -e 'DB_HOST=${dbHost}' -e 'DB_PORT=5432' -e 'DB_DATABASE=folio' -e 'DB_USERNAME=folio' -e 'DB_PASSWORD=folioadmin' -e 'KAFKA_HOST=${dbHost}' -e 'KAFKA_PORT=9092' -e 'OKAPI_URL=http://${okapiIp}:9130' -p${port}:8081 folioci/${modName}:${modVer}
+docker run -d --rm --name ${modName} -e 'DB_HOST=${dbHost}' -e 'DB_PORT=5432' -e 'DB_DATABASE=folio' -e 'DB_USERNAME=folio' -e 'DB_PASSWORD=folioadmin' -e 'KAFKA_HOST=${dbHost}' -e 'KAFKA_PORT=9092' -e 'OKAPI_URL=http://${okapiIp}:9130' -p${port}:8081 folioci/${modName}:${modVer}
diff --git a/config/mod-search.sh b/config/mod-search.sh
index 2403c95..890a110 100644
--- a/config/mod-search.sh
+++ b/config/mod-search.sh
@@ -1 +1 @@
-docker run -d --rm --name ${modName} --sysctl net.ipv6.conf.all.disable_ipv6=1 -e 'DB_HOST=${dbHost}' -e 'ENV=folio' -e 'DB_PORT=5432' -e 'DB_DATABASE=folio' -e 'DB_USERNAME=folio' -e 'DB_PASSWORD=folioadmin' -e 'KAFKA_HOST=${dbHost}' -e 'KAFKA_PORT=9092' -e 'ELASTICSEARCH_HOST=${dbHost}' -e 'ELASTICSEARCH_PASSWORD=s3cret' -e 'OKAPI_URL=http://${okapiIp}:9130' -p${port}:8081 folioci/${modName}:${modVer}
+docker run -d --rm --name ${modName} -e 'DB_HOST=${dbHost}' -e 'ENV=folio' -e 'DB_PORT=5432' -e 'DB_DATABASE=folio' -e 'DB_USERNAME=folio' -e 'DB_PASSWORD=folioadmin' -e 'KAFKA_HOST=${dbHost}' -e 'KAFKA_PORT=9092' -e 'ELASTICSEARCH_HOST=${dbHost}' -e 'ELASTICSEARCH_PASSWORD=s3cret' -e 'OKAPI_URL=http://${okapiIp}:9130' -p${port}:8081 folioci/${modName}:${modVer}
diff --git a/config/mod-service-interaction.sh b/config/mod-service-interaction.sh
index 1a5f4ad..cee9424 100644
--- a/config/mod-service-interaction.sh
+++ b/config/mod-service-interaction.sh
@@ -1 +1 @@
-docker run -d --rm --name ${modName} --sysctl net.ipv6.conf.all.disable_ipv6=1 --mount type=bind,source=/tmp/folio-conf,target=/folio-conf -e 'JAVA_OPTIONS=-Dorg.folio.metadata.inventory.storage.type=okapi' -p${port}:8081 folioci/mod-courses:1.2.3-SNAPSHOT.117 db_connection=/folio-conf/pg.json
+docker run -d --rm --name ${modName} --mount type=bind,source=/tmp/folio-conf,target=/folio-conf -e 'JAVA_OPTIONS=-Dorg.folio.metadata.inventory.storage.type=okapi' -p${port}:8081 folioci/mod-courses:1.2.3-SNAPSHOT.117 db_connection=/folio-conf/pg.json
diff --git a/config/mods.sh b/config/mods.sh
index bbdee7b..61f61f7 100644
--- a/config/mods.sh
+++ b/config/mods.sh
@@ -1 +1 @@
-docker run -d --name ${modName} --sysctl net.ipv6.conf.all.disable_ipv6=1 --mount type=bind,source=/tmp/folio-conf,target=/folio-conf -e 'JAVA_OPTIONS=-Dorg.folio.metadata.inventory.storage.type=okapi' -p${port}:8081 folioci/${modName}:${modVer} db_connection=/folio-conf/pg.json
+docker run -d --name ${modName} --mount type=bind,source=/tmp/folio-conf,target=/folio-conf -e 'JAVA_OPTIONS=-Dorg.folio.metadata.inventory.storage.type=okapi' -p${port}:8081 folioci/${modName}:${modVer} db_connection=/folio-conf/pg.json
diff --git a/config/okapi.sh b/config/okapi.sh
index 5648245..2b6c8b3 100644
--- a/config/okapi.sh
+++ b/config/okapi.sh
@@ -1 +1 @@
-docker run -d --rm --name okapi --sysctl net.ipv6.conf.all.disable_ipv6=1 -e 'JAVA_OPTIONS=-Dokapiurl=http://${okapiPvtIp}:9130 -Dstorage=postgres -Dpostgres_host=${dbPvtIp} -Dpostgres_port=5432 -Dpostgres_user=folio -Dpostgres_password=folioadmin -Dpostgres_database=folio' -p9130:9130 folioorg/okapi:${okapiVersion} cluster
+docker run -d --rm --name okapi -e 'JAVA_OPTIONS=-Dokapiurl=http://${okapiPvtIp}:9130 -Dstorage=postgres -Dpostgres_host=${dbPvtIp} -Dpostgres_port=5432 -Dpostgres_user=folio -Dpostgres_password=folioadmin -Dpostgres_database=folio' -p9130:9130 folioorg/okapi:${okapiVersion} cluster

From 5f2af16f9e1eee4e2dc446132cb34a97fae40e80 Mon Sep 17 00:00:00 2001
From: Maryia_Lazavik <Maryia_Lazavik@epam.com>
Date: Fri, 21 Jan 2022 15:55:11 +0300
Subject: [PATCH 112/153] Revert "FAT-208 Disable ipv6."

This reverts commit 641bfb8a90b7e681e8b930283c97c42c3a5d0985.
---
 Jenkinsfile.integration | 1 -
 shared.groovy           | 9 ---------
 2 files changed, 10 deletions(-)

diff --git a/Jenkinsfile.integration b/Jenkinsfile.integration
index 6e81d3e..4832f33 100644
--- a/Jenkinsfile.integration
+++ b/Jenkinsfile.integration
@@ -54,7 +54,6 @@ node('jenkins-agent-java11') {
 
           stage("Wait for Environment") {
           sharedLib.waitForEnv(context)
-          sharedLib.disableipv6(context)
           }
 
           stage("Bootstrap DB") {
diff --git a/shared.groovy b/shared.groovy
index e0e30c5..35991f1 100644
--- a/shared.groovy
+++ b/shared.groovy
@@ -82,15 +82,6 @@ def waitForEnv(ctx) {
   }
 }
 
-def disableipv6(ctx) {
-  sh "${ctx.sshCmd} -l ${ctx.sshUser} ${ctx.dbIp} sudo sysctl -w net.ipv6.conf.all.disable_ipv6=1"
-  sh "${ctx.sshCmd} -l ${ctx.sshUser} ${ctx.dbIp} sudo sysctl -w net.ipv6.conf.default.disable_ipv6=1"
-  sh "${ctx.sshCmd} -l ${ctx.sshUser} ${ctx.modsIp} sudo sysctl -w net.ipv6.conf.all.disable_ipv6=1"
-  sh "${ctx.sshCmd} -l ${ctx.sshUser} ${ctx.modsIp} sudo sysctl -w net.ipv6.conf.default.disable_ipv6=1"
-  sh "${ctx.sshCmd} -l ${ctx.sshUser} ${ctx.okapiIp} sudo sysctl -w net.ipv6.conf.all.disable_ipv6=1"
-  sh "${ctx.sshCmd} -l ${ctx.sshUser} ${ctx.okapiIp} sudo sysctl -w net.ipv6.conf.default.disable_ipv6=1"
-}
-
 def bootstrapDb(ctx) {
   stopFolioDockers(ctx, ctx.dbIp)
   sh "${ctx.sshCmd} -l ${ctx.sshUser} ${ctx.dbIp} sudo service ecs stop"

From bb807e8b1ffede5c7117966ab0c98db880d2061e Mon Sep 17 00:00:00 2001
From: alehlitasau <92017954+alehlitasau@users.noreply.github.com>
Date: Mon, 24 Jan 2022 12:21:09 +0300
Subject: [PATCH 113/153] RANCHER-146 Change branch for integration tests

---
 shared.groovy | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/shared.groovy b/shared.groovy
index 35991f1..da9af23 100644
--- a/shared.groovy
+++ b/shared.groovy
@@ -321,7 +321,7 @@ def runIntegrationTests(ctx) {
   echo "Checkout folio-integration-tests"
   checkout([
     $class: 'GitSCM',
-    branches: [[name: '*/master']],
+    branches: [[name: '*/RANCHER-146']],
     extensions: scm.extensions + [[$class: 'SubmoduleOption',
                                    disableSubmodules: false,
                                    parentCredentials: false,

From cee6ced538467915be6701a18de353b30a4f2c3d Mon Sep 17 00:00:00 2001
From: alehlitasau <92017954+alehlitasau@users.noreply.github.com>
Date: Mon, 24 Jan 2022 12:55:19 +0300
Subject: [PATCH 114/153] RANCHER-146 delete java8 image usage

---
 Jenkinsfile.integration | 2 --
 1 file changed, 2 deletions(-)

diff --git a/Jenkinsfile.integration b/Jenkinsfile.integration
index 4832f33..b629c36 100644
--- a/Jenkinsfile.integration
+++ b/Jenkinsfile.integration
@@ -73,9 +73,7 @@ node('jenkins-agent-java11') {
           }
 
           stage("Run integration tests") {
-            node('jenkins-slave-all') {
               sharedLib.runIntegrationTests(context)
-            }
           }
         } catch (e) {
           // turn the timer on in case of failures

From 2f76c5ba633c20c67a37b1e587e11f516a4c492f Mon Sep 17 00:00:00 2001
From: alehlitasau <92017954+alehlitasau@users.noreply.github.com>
Date: Mon, 24 Jan 2022 13:04:39 +0300
Subject: [PATCH 115/153] RANCHER-146 change java8 to 11

---
 shared.groovy | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/shared.groovy b/shared.groovy
index da9af23..69933fc 100644
--- a/shared.groovy
+++ b/shared.groovy
@@ -336,7 +336,7 @@ def runIntegrationTests(ctx) {
   echo "Run all folio-integration-tests"
   dir("${env.WORKSPACE}/folio-integration-tests") {
     withMaven(
-      jdk: 'openjdk-8-jenkins-slave-all',
+      jdk: 'openjdk-11-jenkins-slave-all',
       maven: 'maven3-jenkins-slave-all',
       mavenSettingsConfig: 'folioci-maven-settings'
     ) {

From 9c247a1f1c16dd6427f714ddd068aca6d6a1f290 Mon Sep 17 00:00:00 2001
From: AlehLitasau <92017954+AlehLitasau@users.noreply.github.com>
Date: Tue, 25 Jan 2022 14:21:30 +0300
Subject: [PATCH 116/153] RANCHER-146 Add db-host env variable to mod-notes

---
 shared.groovy | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/shared.groovy b/shared.groovy
index 69933fc..69d036a 100644
--- a/shared.groovy
+++ b/shared.groovy
@@ -615,7 +615,8 @@ def deployMods(envName, mods, okapiIp, modsIp, modsPvtIp, dbPvtIp, tenant, sshCm
     }
     // mod-data-import-converter-storage, users has different env variables
     if (modName.equals("mod-data-import-converter-storage") ||
-    modName.equals("mod-users")) {
+    modName.equals("mod-users")) ||
+    modName.equals("mod-notes") {
       modJob = readFile("config/mod-data-import-converter-storage.sh").trim()
       modJob = modJob.replace('${dbHost}', dbPvtIp)
     }

From 44f4399950e80dfd951e191388e8334ae09dc1bd Mon Sep 17 00:00:00 2001
From: AlehLitasau <92017954+AlehLitasau@users.noreply.github.com>
Date: Tue, 25 Jan 2022 15:06:59 +0300
Subject: [PATCH 117/153] RANCHER-146 Fix typo

---
 shared.groovy | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/shared.groovy b/shared.groovy
index 69d036a..945496e 100644
--- a/shared.groovy
+++ b/shared.groovy
@@ -615,8 +615,8 @@ def deployMods(envName, mods, okapiIp, modsIp, modsPvtIp, dbPvtIp, tenant, sshCm
     }
     // mod-data-import-converter-storage, users has different env variables
     if (modName.equals("mod-data-import-converter-storage") ||
-    modName.equals("mod-users")) ||
-    modName.equals("mod-notes") {
+    modName.equals("mod-users") ||
+    modName.equals("mod-notes")) {
       modJob = readFile("config/mod-data-import-converter-storage.sh").trim()
       modJob = modJob.replace('${dbHost}', dbPvtIp)
     }

From ba5e5fdb6b826a9b95184208b6ab799b3cf41635 Mon Sep 17 00:00:00 2001
From: AlehLitasau <92017954+AlehLitasau@users.noreply.github.com>
Date: Wed, 26 Jan 2022 10:08:43 +0300
Subject: [PATCH 118/153] RANCHER-146 Adjust timeout

---
 Jenkinsfile.integration | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Jenkinsfile.integration b/Jenkinsfile.integration
index b629c36..9102831 100644
--- a/Jenkinsfile.integration
+++ b/Jenkinsfile.integration
@@ -30,7 +30,7 @@ def context
 
 
 node('jenkins-agent-java11') {
-  timeout(300) {
+  timeout(600) {
 
     stage("Checkout") {
       cleanWs()

From d9b7ac17f33d9ac167dd9e10c9440b450a9d867a Mon Sep 17 00:00:00 2001
From: Maryia_Lazavik <Maryia_Lazavik@epam.com>
Date: Thu, 27 Jan 2022 19:34:41 +0300
Subject: [PATCH 119/153] RANCHER-146 fix run integration test from master

---
 shared.groovy | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/shared.groovy b/shared.groovy
index 945496e..3117bfa 100644
--- a/shared.groovy
+++ b/shared.groovy
@@ -321,7 +321,7 @@ def runIntegrationTests(ctx) {
   echo "Checkout folio-integration-tests"
   checkout([
     $class: 'GitSCM',
-    branches: [[name: '*/RANCHER-146']],
+    branches: [[name: '*/master']],
     extensions: scm.extensions + [[$class: 'SubmoduleOption',
                                    disableSubmodules: false,
                                    parentCredentials: false,

From baa46121edde76fcc7bc301b25a1402a811217e4 Mon Sep 17 00:00:00 2001
From: Maryia_Lazavik <Maryia_Lazavik@epam.com>
Date: Mon, 7 Feb 2022 19:36:28 +0300
Subject: [PATCH 120/153] FAT-208 update slack's notification from cucumber
 report

---
 Jenkinsfile.integration |  2 +-
 shared.groovy           | 89 ++++++++++++++++++++++++++++-------------
 2 files changed, 62 insertions(+), 29 deletions(-)

diff --git a/Jenkinsfile.integration b/Jenkinsfile.integration
index 9102831..28780d6 100644
--- a/Jenkinsfile.integration
+++ b/Jenkinsfile.integration
@@ -48,7 +48,7 @@ node('jenkins-agent-java11') {
         try {
 
           stage("Create Environment") {
-            sharedLib.notifySlack()
+            // sharedLib.notifySlack()
             sharedLib.createEnv(context)
           }
 
diff --git a/shared.groovy b/shared.groovy
index 3117bfa..e4976da 100644
--- a/shared.groovy
+++ b/shared.groovy
@@ -354,25 +354,42 @@ def runIntegrationTests(ctx) {
       }
     }
     sh "mkdir ${env.WORKSPACE}/folio-integration-tests/cucumber-reports"
-    sh """
-    path_rep="${env.WORKSPACE}/folio-integration-tests/cucumber-reports"
-    test_list=\$(find . | grep json | grep '/target/karate-reports')
-    for file in \$test_list
-    do
-      sname=\${file##*/}
-      tp=\${sname##*\\.}
-      name=\${sname%\\.\$tp}
-      cc=\$sname
-      i=0
-      while [ -a "\${path_rep}/\${sname}" ]
-        do
-        i=\$(( \$i + 1 ))
-        sname="\${name}_\${i}.\${tp}"
-      done
-      cp \$file \${path_rep}/\$sname
-    done
-    """
-    //sh "find . | grep json | grep '/target/karate-reports' | xargs -i cp {} ${env.WORKSPACE}/folio-integration-tests/cucumber-reports"
+    sh "find . | grep json | grep '/target/karate-reports' | xargs -i cp {} ${env.WORKSPACE}/folio-integration-tests/cucumber-reports"
+    teams = ['thunderjet', 'firebird', 'core-functional', 'folijet', 'spitfire', 'vega', 'core-platform', 'erm-delivery', 'fse', 'stripes', 'leipzig',
+             'ncip', 'thor', 'falcon', 'volaris', 'knowledgeware', 'spring']
+    teams_test = ['spitfire', 'folijet', 'thunderjet', 'firebird', 'core_functional', 'vega', 'core_platform', 'falcon']
+    team_modules = [spitfire: ['mod-kb-ebsco-java', 'tags', 'codexekb', 'mod-notes', 'mod-quick-marc', 'passwordvalidator'],
+                    folijet: ['mod-source-record-storage', 'mod-source-record-manager', 'mod-data-import', 'data-import', 'mod-data-import-converter-storage'],
+                    thunderjet: ['mod-finance', 'edge-orders', 'mod-gobi', 'mod-orders', 'mod-invoice', 'mod-ebsconet'],
+                    firebird: ['mod-audit', 'edge-dematic', 'edge-caiasoft', 'dataexport', 'oaipmh'],
+                    core_functional: ['mod-inventory', 'mod-circulation', 'mod-users-bl'],
+                    vega: ['mod-event-config', 'mod-sender', 'mod-template-engine', 'mod-email', 'mod-notify', 'mod-feesfines', 'mod-patron-blocks', 'mod-calendar'],
+                    core_platform: ['mod-configuration', 'mod-permissions', 'mod-login-saml', 'mod-user-import'],
+                    falcon: ['mod-search']
+                    ]
+    dir("${env.WORKSPACE}/folio-integration-tests/cucumber-reports"){
+      for (team in teams_test){
+        sh """
+        mkdir ${team}
+        touch ${team}/status.txt
+        touch ${team}/failed.txt
+        echo -n SUCCESS > ${team}/status.txt
+        """
+        for (mod in team_modules[team]){
+          sh """
+          for i in \$(find .. | grep json | grep '/target/karate-reports'| grep summary); do
+		        if [[ \$(cat \$i | grep ${mod}) ]]; then
+			        if [[ \$(cat \$i | grep '"failed":true') ]]; then
+				        echo -n FAILED > ${team}/status.txt
+                echo ${mod} >> ${team}/failed.txt
+				        break
+			        fi
+		        fi
+	        done
+          """
+        }
+      }
+    }
     cucumber buildStatus: "UNSTABLE",
       fileIncludePattern: "*.json",
       jsonReportDirectory: "cucumber-reports"
@@ -740,21 +757,37 @@ def stopFolioDockers(ctx, ip) {
 }
 
 def notifySlack(String buildStatus = 'STARTED') {
-
-    // Build status of null means success.
-    buildStatus = buildStatus ?: 'SUCCESS'
+  teams_test = ['spitfire', 'folijet', 'thunderjet', 'firebird', 'core_functional', 'vega', 'core_platform', 'falcon']
+  teams_channels = [spitfire: '#spitfire', folijet: '#folijet', thunderjet: '#acquisitions-dev', firebird: '#firebird',
+                    core_functional: '#prokopovych', vega: '#vega', core_platform: '#core-platform', falcon: '#falcon']
+
+  // Build status of null means success.
+  buildStatus = buildStatus ?: 'SUCCESS'
+  def msg = "${buildStatus}: `${env.JOB_NAME}` #${env.BUILD_NUMBER}:\n${env.BUILD_URL}"
+  
+  //slackSend(color: color, message: msg, channel: '#api-integration-testing')
+  for (team in teams_test) {
+    def tests_status = readFile "${env.WORKSPACE}/folio-integration-tests/cucumber-reports/${team}/status.txt"
+    def failed_mod = readFile "${env.WORKSPACE}/folio-integration-tests/cucumber-reports/${team}/failed.txt"
     def color
-    if (buildStatus == 'STARTED') {
+    def team_msg
+    if (tests_status == 'STARTED') {
         color = '#D4DADF'
-    } else if (buildStatus == 'SUCCESS') {
+    } else if (tests_status == 'SUCCESS') {
         color = '#BDFFC3'
-    } else if (buildStatus == 'UNSTABLE') {
+    } else if (tests_status == 'UNSTABLE') {
         color = '#FFFE89'
     } else {
-        color = '#FF9FA1'
+      color = '#FF9FA1'
     }
-    def msg = "${buildStatus}: `${env.JOB_NAME}` #${env.BUILD_NUMBER}:\n${env.BUILD_URL}"
-    slackSend(color: color, message: msg, channel: '#api-integration-testing')
+    if (tests_status == 'FAILED'){
+      team_msg = "${tests_status}: `${env.JOB_NAME}` #${env.BUILD_NUMBER}:\n${env.BUILD_URL}\n Failed:\n${failed_mod}"
+    } else {
+      team_msg = "${tests_status}: `${env.JOB_NAME}` #${env.BUILD_NUMBER}:\n${env.BUILD_URL}"
+      }
+    slackSend(color: color, message: team_msg, channel: "#karate-tests-reports-${team}")
+    slackSend(color: color, message: team_msg, channel: "${teams_channels[team]}")
+  }
 }
 
 return this

From c70a3969ffc523e0474f82123d929942dcfff8b3 Mon Sep 17 00:00:00 2001
From: Maryia_Lazavik <Maryia_Lazavik@epam.com>
Date: Mon, 7 Feb 2022 20:30:14 +0300
Subject: [PATCH 121/153] FAT-208 change core_functional to Prokopovych

---
 shared.groovy | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/shared.groovy b/shared.groovy
index e4976da..d385401 100644
--- a/shared.groovy
+++ b/shared.groovy
@@ -355,15 +355,15 @@ def runIntegrationTests(ctx) {
     }
     sh "mkdir ${env.WORKSPACE}/folio-integration-tests/cucumber-reports"
     sh "find . | grep json | grep '/target/karate-reports' | xargs -i cp {} ${env.WORKSPACE}/folio-integration-tests/cucumber-reports"
-    teams = ['thunderjet', 'firebird', 'core-functional', 'folijet', 'spitfire', 'vega', 'core-platform', 'erm-delivery', 'fse', 'stripes', 'leipzig',
+    teams = ['thunderjet', 'firebird', 'prokopovych', 'folijet', 'spitfire', 'vega', 'core-platform', 'erm-delivery', 'fse', 'stripes', 'leipzig',
              'ncip', 'thor', 'falcon', 'volaris', 'knowledgeware', 'spring']
-    teams_test = ['spitfire', 'folijet', 'thunderjet', 'firebird', 'core_functional', 'vega', 'core_platform', 'falcon']
+    teams_test = ['spitfire', 'folijet', 'thunderjet', 'firebird', 'prokopovych', 'vega', 'core_platform', 'falcon']
     team_modules = [spitfire: ['mod-kb-ebsco-java', 'tags', 'codexekb', 'mod-notes', 'mod-quick-marc', 'passwordvalidator'],
                     folijet: ['mod-source-record-storage', 'mod-source-record-manager', 'mod-data-import', 'data-import', 'mod-data-import-converter-storage'],
-                    thunderjet: ['mod-finance', 'edge-orders', 'mod-gobi', 'mod-orders', 'mod-invoice', 'mod-ebsconet'],
+                    thunderjet: ['mod-finance', 'edge-orders', 'mod-gobi', 'mod-orders', 'mod-organizations', 'mod-invoice', 'mod-ebsconet', 'cross-modules'],
                     firebird: ['mod-audit', 'edge-dematic', 'edge-caiasoft', 'dataexport', 'oaipmh'],
-                    core_functional: ['mod-inventory', 'mod-circulation', 'mod-users-bl'],
-                    vega: ['mod-event-config', 'mod-sender', 'mod-template-engine', 'mod-email', 'mod-notify', 'mod-feesfines', 'mod-patron-blocks', 'mod-calendar'],
+                    prokopovych: ['mod-inventory', 'mod-users-bl', 'edge-patron', 'edge-rtac', 'mod-users'],
+                    vega: ['mod-event-config', 'mod-sender', 'mod-circulation', 'mod-template-engine', 'mod-email', 'mod-notify', 'mod-feesfines', 'mod-patron-blocks', 'mod-circulation', 'mod-calendar'],
                     core_platform: ['mod-configuration', 'mod-permissions', 'mod-login-saml', 'mod-user-import'],
                     falcon: ['mod-search']
                     ]
@@ -759,7 +759,7 @@ def stopFolioDockers(ctx, ip) {
 def notifySlack(String buildStatus = 'STARTED') {
   teams_test = ['spitfire', 'folijet', 'thunderjet', 'firebird', 'core_functional', 'vega', 'core_platform', 'falcon']
   teams_channels = [spitfire: '#spitfire', folijet: '#folijet', thunderjet: '#acquisitions-dev', firebird: '#firebird',
-                    core_functional: '#prokopovych', vega: '#vega', core_platform: '#core-platform', falcon: '#falcon']
+                   prokopovych: '#prokopovych', vega: '#vega', core_platform: '#core-platform', falcon: '#falcon']
 
   // Build status of null means success.
   buildStatus = buildStatus ?: 'SUCCESS'

From 4ba5f6552c5a201baeb256057069a0e7365d549e Mon Sep 17 00:00:00 2001
From: Maryia_Lazavik <Maryia_Lazavik@epam.com>
Date: Mon, 7 Feb 2022 20:33:17 +0300
Subject: [PATCH 122/153] FAT-208 change core_functional to Prokopovych

---
 shared.groovy | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/shared.groovy b/shared.groovy
index d385401..ac267a4 100644
--- a/shared.groovy
+++ b/shared.groovy
@@ -757,7 +757,7 @@ def stopFolioDockers(ctx, ip) {
 }
 
 def notifySlack(String buildStatus = 'STARTED') {
-  teams_test = ['spitfire', 'folijet', 'thunderjet', 'firebird', 'core_functional', 'vega', 'core_platform', 'falcon']
+  teams_test = ['spitfire', 'folijet', 'thunderjet', 'firebird', 'prokopovych', 'vega', 'core_platform', 'falcon']
   teams_channels = [spitfire: '#spitfire', folijet: '#folijet', thunderjet: '#acquisitions-dev', firebird: '#firebird',
                    prokopovych: '#prokopovych', vega: '#vega', core_platform: '#core-platform', falcon: '#falcon']
 

From 89d989787b8f702d72e3a19bd525f8b1939b4f28 Mon Sep 17 00:00:00 2001
From: Maryia_Lazavik <Maryia_Lazavik@epam.com>
Date: Tue, 15 Feb 2022 13:31:02 +0300
Subject: [PATCH 123/153] RANCHER-180

---
 config/mod-circulation.sh | 1 +
 shared.groovy             | 7 ++++++-
 2 files changed, 7 insertions(+), 1 deletion(-)
 create mode 100644 config/mod-circulation.sh

diff --git a/config/mod-circulation.sh b/config/mod-circulation.sh
new file mode 100644
index 0000000..9a2587a
--- /dev/null
+++ b/config/mod-circulation.sh
@@ -0,0 +1 @@
+docker run -d --rm --name ${modName} --mount type=bind,source=/tmp/folio-conf,target=/folio-conf -e 'OKAPI_URL=http://${okapiIp}:9130' -e 'KAFKA_HOST=${dbHost}' -e 'KAFKA_PORT=9092' -e 'ENV=${envName}' -e 'JAVA_OPTIONS=-Dorg.folio.metadata.inventory.storage.type=okapi' -p${port}:8081 folioci/${modName}:${modVer} db_connection=/folio-conf/pg.json
diff --git a/shared.groovy b/shared.groovy
index ac267a4..fcb8cd7 100644
--- a/shared.groovy
+++ b/shared.groovy
@@ -703,7 +703,12 @@ def deployMods(envName, mods, okapiIp, modsIp, modsPvtIp, dbPvtIp, tenant, sshCm
    // }
     // mod-circulation uses port 9801, not 8081
     if (modName.equals("mod-circulation")) {
-      modJob = modJob.replace('8081', '9801')
+      modJob = readFile("config/mod-circulation.sh").trim()
+      // modJob = modJob.replace('8081', '9801')
+      modJob = modJob.replace('${dbHost}', dbPvtIp)
+
+
+
 
     }
     // mod-login has a special parameter

From f24bf3b0cf3baf7c8d6ab4d6f0a0b6fc775b7627 Mon Sep 17 00:00:00 2001
From: Maryia_Lazavik <Maryia_Lazavik@epam.com>
Date: Tue, 15 Feb 2022 13:48:19 +0300
Subject: [PATCH 124/153] RANCHER-180 add var to mod-circulation-storage

---
 shared.groovy | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/shared.groovy b/shared.groovy
index fcb8cd7..e4e157c 100644
--- a/shared.groovy
+++ b/shared.groovy
@@ -706,6 +706,8 @@ def deployMods(envName, mods, okapiIp, modsIp, modsPvtIp, dbPvtIp, tenant, sshCm
       modJob = readFile("config/mod-circulation.sh").trim()
       // modJob = modJob.replace('8081', '9801')
       modJob = modJob.replace('${dbHost}', dbPvtIp)
+      modJob = modJob.replace('${okapiIp}', okapiIp)
+
 
 
 

From 715ac8d71d2402e9e8374ff59721166104b129dd Mon Sep 17 00:00:00 2001
From: Maryia_Lazavik <Maryia_Lazavik@epam.com>
Date: Tue, 15 Feb 2022 14:03:00 +0300
Subject: [PATCH 125/153] RANCHER-180 add var to mod-circulation-storage

---
 shared.groovy | 1 +
 1 file changed, 1 insertion(+)

diff --git a/shared.groovy b/shared.groovy
index e4e157c..2f8e975 100644
--- a/shared.groovy
+++ b/shared.groovy
@@ -705,6 +705,7 @@ def deployMods(envName, mods, okapiIp, modsIp, modsPvtIp, dbPvtIp, tenant, sshCm
     if (modName.equals("mod-circulation")) {
       modJob = readFile("config/mod-circulation.sh").trim()
       // modJob = modJob.replace('8081', '9801')
+      modJob = modJob.replace('${modName}', modName)
       modJob = modJob.replace('${dbHost}', dbPvtIp)
       modJob = modJob.replace('${okapiIp}', okapiIp)
 

From 83791167335a0ddfbe67000e9d6ee819ea4f8f27 Mon Sep 17 00:00:00 2001
From: Maryia_Lazavik <Maryia_Lazavik@epam.com>
Date: Tue, 15 Feb 2022 14:15:23 +0300
Subject: [PATCH 126/153] RANCHER-180 add var to mod-circulation-storage

---
 config/mod-circulation.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/config/mod-circulation.sh b/config/mod-circulation.sh
index 9a2587a..22ace47 100644
--- a/config/mod-circulation.sh
+++ b/config/mod-circulation.sh
@@ -1 +1 @@
-docker run -d --rm --name ${modName} --mount type=bind,source=/tmp/folio-conf,target=/folio-conf -e 'OKAPI_URL=http://${okapiIp}:9130' -e 'KAFKA_HOST=${dbHost}' -e 'KAFKA_PORT=9092' -e 'ENV=${envName}' -e 'JAVA_OPTIONS=-Dorg.folio.metadata.inventory.storage.type=okapi' -p${port}:8081 folioci/${modName}:${modVer} db_connection=/folio-conf/pg.json
+docker run -d --rm --name ${modName} --mount type=bind,source=/tmp/folio-conf,target=/folio-conf -e 'OKAPI_URL=http://${okapiIp}:9130' -e 'KAFKA_HOST=${dbHost}' -e 'KAFKA_PORT=9092' -e 'JAVA_OPTIONS=-Dorg.folio.metadata.inventory.storage.type=okapi' -p${port}:8081 folioci/${modName}:${modVer} db_connection=/folio-conf/pg.json

From 8957398c8eacc964a6dec8d7bec3164d9647524c Mon Sep 17 00:00:00 2001
From: Maryia_Lazavik <Maryia_Lazavik@epam.com>
Date: Tue, 15 Feb 2022 14:27:43 +0300
Subject: [PATCH 127/153] RANCHER-180 add var to mod-circulation-storage

---
 shared.groovy | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/shared.groovy b/shared.groovy
index 2f8e975..1b50f27 100644
--- a/shared.groovy
+++ b/shared.groovy
@@ -704,10 +704,12 @@ def deployMods(envName, mods, okapiIp, modsIp, modsPvtIp, dbPvtIp, tenant, sshCm
     // mod-circulation uses port 9801, not 8081
     if (modName.equals("mod-circulation")) {
       modJob = readFile("config/mod-circulation.sh").trim()
-      // modJob = modJob.replace('8081', '9801')
+      modJob = modJob.replace('8081', '9801')
       modJob = modJob.replace('${modName}', modName)
       modJob = modJob.replace('${dbHost}', dbPvtIp)
       modJob = modJob.replace('${okapiIp}', okapiIp)
+      modJob = modJob.replace('${port}', '' + port)
+      modJob = modJob.replace('${modVer}', "" + modVer)
 
 
 

From b405d23230faa5dad6d4333d78cbd60f18eafb60 Mon Sep 17 00:00:00 2001
From: Maryia_Lazavik <Maryia_Lazavik@epam.com>
Date: Tue, 15 Feb 2022 15:06:57 +0300
Subject: [PATCH 128/153] RANCHER-180 add -e env

---
 config/mod-circulation.sh | 2 +-
 shared.groovy             | 2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/config/mod-circulation.sh b/config/mod-circulation.sh
index 22ace47..9a2587a 100644
--- a/config/mod-circulation.sh
+++ b/config/mod-circulation.sh
@@ -1 +1 @@
-docker run -d --rm --name ${modName} --mount type=bind,source=/tmp/folio-conf,target=/folio-conf -e 'OKAPI_URL=http://${okapiIp}:9130' -e 'KAFKA_HOST=${dbHost}' -e 'KAFKA_PORT=9092' -e 'JAVA_OPTIONS=-Dorg.folio.metadata.inventory.storage.type=okapi' -p${port}:8081 folioci/${modName}:${modVer} db_connection=/folio-conf/pg.json
+docker run -d --rm --name ${modName} --mount type=bind,source=/tmp/folio-conf,target=/folio-conf -e 'OKAPI_URL=http://${okapiIp}:9130' -e 'KAFKA_HOST=${dbHost}' -e 'KAFKA_PORT=9092' -e 'ENV=${envName}' -e 'JAVA_OPTIONS=-Dorg.folio.metadata.inventory.storage.type=okapi' -p${port}:8081 folioci/${modName}:${modVer} db_connection=/folio-conf/pg.json
diff --git a/shared.groovy b/shared.groovy
index 1b50f27..ae9652a 100644
--- a/shared.groovy
+++ b/shared.groovy
@@ -710,6 +710,8 @@ def deployMods(envName, mods, okapiIp, modsIp, modsPvtIp, dbPvtIp, tenant, sshCm
       modJob = modJob.replace('${okapiIp}', okapiIp)
       modJob = modJob.replace('${port}', '' + port)
       modJob = modJob.replace('${modVer}', "" + modVer)
+      modJob = modJob.replace('${envName}', envName)
+
 
 
 

From 10a73b8371c73f30778050d3e63c9905f6800951 Mon Sep 17 00:00:00 2001
From: Maryia_Lazavik <Maryia_Lazavik@epam.com>
Date: Tue, 15 Feb 2022 15:51:16 +0300
Subject: [PATCH 129/153] RANCHER-180 add mod-circulation-storage

---
 config/mod-circulation-storage.sh |  1 +
 shared.groovy                     | 13 +++++++++++++
 2 files changed, 14 insertions(+)
 create mode 100644 config/mod-circulation-storage.sh

diff --git a/config/mod-circulation-storage.sh b/config/mod-circulation-storage.sh
new file mode 100644
index 0000000..9a2587a
--- /dev/null
+++ b/config/mod-circulation-storage.sh
@@ -0,0 +1 @@
+docker run -d --rm --name ${modName} --mount type=bind,source=/tmp/folio-conf,target=/folio-conf -e 'OKAPI_URL=http://${okapiIp}:9130' -e 'KAFKA_HOST=${dbHost}' -e 'KAFKA_PORT=9092' -e 'ENV=${envName}' -e 'JAVA_OPTIONS=-Dorg.folio.metadata.inventory.storage.type=okapi' -p${port}:8081 folioci/${modName}:${modVer} db_connection=/folio-conf/pg.json
diff --git a/shared.groovy b/shared.groovy
index ae9652a..af1abf4 100644
--- a/shared.groovy
+++ b/shared.groovy
@@ -711,6 +711,19 @@ def deployMods(envName, mods, okapiIp, modsIp, modsPvtIp, dbPvtIp, tenant, sshCm
       modJob = modJob.replace('${port}', '' + port)
       modJob = modJob.replace('${modVer}', "" + modVer)
       modJob = modJob.replace('${envName}', envName)
+    }
+
+    // mod-circulation-storage uses port 9801, not 8081
+    if (modName.equals("mod-circulation-storage")) {
+      modJob = readFile("config/mod-circulation-storage.sh").trim()
+      modJob = modJob.replace('8081', '9801')
+      modJob = modJob.replace('${modName}', modName)
+      modJob = modJob.replace('${dbHost}', dbPvtIp)
+      modJob = modJob.replace('${okapiIp}', okapiIp)
+      modJob = modJob.replace('${port}', '' + port)
+      modJob = modJob.replace('${modVer}', "" + modVer)
+      modJob = modJob.replace('${envName}', envName)
+    
 
 
 

From f6d4f2a8fa52b954e7cfe76c28d6f6fcceb2e43f Mon Sep 17 00:00:00 2001
From: Maryia_Lazavik <Maryia_Lazavik@epam.com>
Date: Wed, 16 Feb 2022 12:54:13 +0300
Subject: [PATCH 130/153] RACNHER-180 update mod-circulation

---
 config/mod-circulation.sh |  1 -
 shared.groovy             | 10 +---------
 2 files changed, 1 insertion(+), 10 deletions(-)
 delete mode 100644 config/mod-circulation.sh

diff --git a/config/mod-circulation.sh b/config/mod-circulation.sh
deleted file mode 100644
index 9a2587a..0000000
--- a/config/mod-circulation.sh
+++ /dev/null
@@ -1 +0,0 @@
-docker run -d --rm --name ${modName} --mount type=bind,source=/tmp/folio-conf,target=/folio-conf -e 'OKAPI_URL=http://${okapiIp}:9130' -e 'KAFKA_HOST=${dbHost}' -e 'KAFKA_PORT=9092' -e 'ENV=${envName}' -e 'JAVA_OPTIONS=-Dorg.folio.metadata.inventory.storage.type=okapi' -p${port}:8081 folioci/${modName}:${modVer} db_connection=/folio-conf/pg.json
diff --git a/shared.groovy b/shared.groovy
index af1abf4..88a8dd2 100644
--- a/shared.groovy
+++ b/shared.groovy
@@ -703,20 +703,12 @@ def deployMods(envName, mods, okapiIp, modsIp, modsPvtIp, dbPvtIp, tenant, sshCm
    // }
     // mod-circulation uses port 9801, not 8081
     if (modName.equals("mod-circulation")) {
-      modJob = readFile("config/mod-circulation.sh").trim()
       modJob = modJob.replace('8081', '9801')
-      modJob = modJob.replace('${modName}', modName)
-      modJob = modJob.replace('${dbHost}', dbPvtIp)
-      modJob = modJob.replace('${okapiIp}', okapiIp)
-      modJob = modJob.replace('${port}', '' + port)
-      modJob = modJob.replace('${modVer}', "" + modVer)
-      modJob = modJob.replace('${envName}', envName)
-    }
 
     // mod-circulation-storage uses port 9801, not 8081
     if (modName.equals("mod-circulation-storage")) {
       modJob = readFile("config/mod-circulation-storage.sh").trim()
-      modJob = modJob.replace('8081', '9801')
+      // modJob = modJob.replace('8081', '9801')
       modJob = modJob.replace('${modName}', modName)
       modJob = modJob.replace('${dbHost}', dbPvtIp)
       modJob = modJob.replace('${okapiIp}', okapiIp)

From 5a715fd4011ea9be80fcfaf153ff9242b634c126 Mon Sep 17 00:00:00 2001
From: Maryia_Lazavik <Maryia_Lazavik@epam.com>
Date: Wed, 16 Feb 2022 13:00:43 +0300
Subject: [PATCH 131/153] RANCHER-172 fix sintax

---
 shared.groovy | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

diff --git a/shared.groovy b/shared.groovy
index 88a8dd2..f155350 100644
--- a/shared.groovy
+++ b/shared.groovy
@@ -704,6 +704,7 @@ def deployMods(envName, mods, okapiIp, modsIp, modsPvtIp, dbPvtIp, tenant, sshCm
     // mod-circulation uses port 9801, not 8081
     if (modName.equals("mod-circulation")) {
       modJob = modJob.replace('8081', '9801')
+    }
 
     // mod-circulation-storage uses port 9801, not 8081
     if (modName.equals("mod-circulation-storage")) {
@@ -715,12 +716,8 @@ def deployMods(envName, mods, okapiIp, modsIp, modsPvtIp, dbPvtIp, tenant, sshCm
       modJob = modJob.replace('${port}', '' + port)
       modJob = modJob.replace('${modVer}', "" + modVer)
       modJob = modJob.replace('${envName}', envName)
-    
-
-
-
-
 
+      
 
     }
     // mod-login has a special parameter

From 9d82b0e7db7f0cafd72bfe9b3a8011793519c1a6 Mon Sep 17 00:00:00 2001
From: maryialazavik <96044720+MaryiaLazavik@users.noreply.github.com>
Date: Tue, 22 Feb 2022 14:41:19 +0300
Subject: [PATCH 132/153] RANCHER-172 change branch master to FAT-1548 test

---
 shared.groovy | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/shared.groovy b/shared.groovy
index f155350..0442ccf 100644
--- a/shared.groovy
+++ b/shared.groovy
@@ -321,7 +321,7 @@ def runIntegrationTests(ctx) {
   echo "Checkout folio-integration-tests"
   checkout([
     $class: 'GitSCM',
-    branches: [[name: '*/master']],
+    branches: [[name: '*/FAT-1548']],
     extensions: scm.extensions + [[$class: 'SubmoduleOption',
                                    disableSubmodules: false,
                                    parentCredentials: false,

From 4605c64f5637669947f26c10adbffbd7235a4afe Mon Sep 17 00:00:00 2001
From: maryialazavik <96044720+MaryiaLazavik@users.noreply.github.com>
Date: Tue, 22 Feb 2022 19:36:04 +0300
Subject: [PATCH 133/153] RANCHER-172 change to master integrationtest

---
 shared.groovy | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/shared.groovy b/shared.groovy
index 0442ccf..f155350 100644
--- a/shared.groovy
+++ b/shared.groovy
@@ -321,7 +321,7 @@ def runIntegrationTests(ctx) {
   echo "Checkout folio-integration-tests"
   checkout([
     $class: 'GitSCM',
-    branches: [[name: '*/FAT-1548']],
+    branches: [[name: '*/master']],
     extensions: scm.extensions + [[$class: 'SubmoduleOption',
                                    disableSubmodules: false,
                                    parentCredentials: false,

From 73f36e72192194b17be84e9831da341c7cec0989 Mon Sep 17 00:00:00 2001
From: maryialazavik <96044720+MaryiaLazavik@users.noreply.github.com>
Date: Wed, 23 Feb 2022 09:59:03 +0300
Subject: [PATCH 134/153] change team_channel to thunderjet

---
 shared.groovy | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/shared.groovy b/shared.groovy
index f155350..0a829b5 100644
--- a/shared.groovy
+++ b/shared.groovy
@@ -772,7 +772,7 @@ def stopFolioDockers(ctx, ip) {
 
 def notifySlack(String buildStatus = 'STARTED') {
   teams_test = ['spitfire', 'folijet', 'thunderjet', 'firebird', 'prokopovych', 'vega', 'core_platform', 'falcon']
-  teams_channels = [spitfire: '#spitfire', folijet: '#folijet', thunderjet: '#acquisitions-dev', firebird: '#firebird',
+  teams_channels = [spitfire: '#spitfire', folijet: '#folijet', thunderjet: '#thunderjet-back-end', firebird: '#firebird',
                    prokopovych: '#prokopovych', vega: '#vega', core_platform: '#core-platform', falcon: '#falcon']
 
   // Build status of null means success.

From 9f35235841d88a2c89e70566bda02393c2ad47f5 Mon Sep 17 00:00:00 2001
From: Maryia_Lazavik <Maryia_Lazavik@epam.com>
Date: Wed, 2 Mar 2022 18:30:36 +0300
Subject: [PATCH 135/153] FAT-1150 fix env to mod-search

---
 config/mod-search.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/config/mod-search.sh b/config/mod-search.sh
index 890a110..31ef0e9 100644
--- a/config/mod-search.sh
+++ b/config/mod-search.sh
@@ -1 +1 @@
-docker run -d --rm --name ${modName} -e 'DB_HOST=${dbHost}' -e 'ENV=folio' -e 'DB_PORT=5432' -e 'DB_DATABASE=folio' -e 'DB_USERNAME=folio' -e 'DB_PASSWORD=folioadmin' -e 'KAFKA_HOST=${dbHost}' -e 'KAFKA_PORT=9092' -e 'ELASTICSEARCH_HOST=${dbHost}' -e 'ELASTICSEARCH_PASSWORD=s3cret' -e 'OKAPI_URL=http://${okapiIp}:9130' -p${port}:8081 folioci/${modName}:${modVer}
+docker run -d --rm --name ${modName} -e 'DB_HOST=${dbHost}' -e 'ENV=${envName}' -e 'DB_PORT=5432' -e 'DB_DATABASE=folio' -e 'DB_USERNAME=folio' -e 'DB_PASSWORD=folioadmin' -e 'KAFKA_HOST=${dbHost}' -e 'KAFKA_PORT=9092' -e 'ELASTICSEARCH_HOST=${dbHost}' -e 'ELASTICSEARCH_PASSWORD=s3cret' -e 'OKAPI_URL=http://${okapiIp}:9130' -p${port}:8081 folioci/${modName}:${modVer}

From 34b8e04c0a874707270641fe47deb39b32f472db Mon Sep 17 00:00:00 2001
From: maryialazavik <96044720+MaryiaLazavik@users.noreply.github.com>
Date: Thu, 3 Mar 2022 10:49:36 +0300
Subject: [PATCH 136/153] FAT-1150 add veriable envname to mod-search

---
 shared.groovy | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/shared.groovy b/shared.groovy
index 0a829b5..7829027 100644
--- a/shared.groovy
+++ b/shared.groovy
@@ -650,6 +650,8 @@ def deployMods(envName, mods, okapiIp, modsIp, modsPvtIp, dbPvtIp, tenant, sshCm
       modJob = readFile("config/mod-search.sh").trim()
       modJob = modJob.replace('${dbHost}', dbPvtIp)
       modJob = modJob.replace('${okapiIp}', okapiIp)
+      modJob = modJob.replace('${envName}', envName)
+      
     }
     // mod-oa has different env variables
     if (modName.equals("mod-oa")) {

From 964b77df2c3779170cb352813eac2d87e13e5079 Mon Sep 17 00:00:00 2001
From: Maryia_Lazavik <Maryia_Lazavik@epam.com>
Date: Fri, 18 Mar 2022 15:22:31 +0300
Subject: [PATCH 137/153] RANCHER-192 add bama team to slack

---
 shared.groovy | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/shared.groovy b/shared.groovy
index 7829027..44c7138 100644
--- a/shared.groovy
+++ b/shared.groovy
@@ -355,17 +355,18 @@ def runIntegrationTests(ctx) {
     }
     sh "mkdir ${env.WORKSPACE}/folio-integration-tests/cucumber-reports"
     sh "find . | grep json | grep '/target/karate-reports' | xargs -i cp {} ${env.WORKSPACE}/folio-integration-tests/cucumber-reports"
-    teams = ['thunderjet', 'firebird', 'prokopovych', 'folijet', 'spitfire', 'vega', 'core-platform', 'erm-delivery', 'fse', 'stripes', 'leipzig',
+    teams = ['thunderjet', 'bama', 'firebird', 'prokopovych', 'folijet', 'spitfire', 'vega', 'core-platform', 'erm-delivery', 'fse', 'stripes', 'leipzig',
              'ncip', 'thor', 'falcon', 'volaris', 'knowledgeware', 'spring']
-    teams_test = ['spitfire', 'folijet', 'thunderjet', 'firebird', 'prokopovych', 'vega', 'core_platform', 'falcon']
+    teams_test = ['spitfire', 'bama', 'folijet', 'thunderjet', 'firebird', 'prokopovych', 'vega', 'core_platform', 'falcon']
     team_modules = [spitfire: ['mod-kb-ebsco-java', 'tags', 'codexekb', 'mod-notes', 'mod-quick-marc', 'passwordvalidator'],
                     folijet: ['mod-source-record-storage', 'mod-source-record-manager', 'mod-data-import', 'data-import', 'mod-data-import-converter-storage'],
                     thunderjet: ['mod-finance', 'edge-orders', 'mod-gobi', 'mod-orders', 'mod-organizations', 'mod-invoice', 'mod-ebsconet', 'cross-modules'],
                     firebird: ['mod-audit', 'edge-dematic', 'edge-caiasoft', 'dataexport', 'oaipmh'],
                     prokopovych: ['mod-inventory', 'mod-users-bl', 'edge-patron', 'edge-rtac', 'mod-users'],
-                    vega: ['mod-event-config', 'mod-sender', 'mod-circulation', 'mod-template-engine', 'mod-email', 'mod-notify', 'mod-feesfines', 'mod-patron-blocks', 'mod-circulation', 'mod-calendar'],
+                    vega: ['mod-event-config', 'mod-sender', 'mod-circulation', 'mod-template-engine', 'mod-email', 'mod-notify', 'mod-feesfines', 'mod-patron-blocks', 'mod-circulation'],
                     core_platform: ['mod-configuration', 'mod-permissions', 'mod-login-saml', 'mod-user-import'],
                     falcon: ['mod-search']
+                    bama: ['mod-calendar']
                     ]
     dir("${env.WORKSPACE}/folio-integration-tests/cucumber-reports"){
       for (team in teams_test){
@@ -773,8 +774,8 @@ def stopFolioDockers(ctx, ip) {
 }
 
 def notifySlack(String buildStatus = 'STARTED') {
-  teams_test = ['spitfire', 'folijet', 'thunderjet', 'firebird', 'prokopovych', 'vega', 'core_platform', 'falcon']
-  teams_channels = [spitfire: '#spitfire', folijet: '#folijet', thunderjet: '#thunderjet-back-end', firebird: '#firebird',
+  teams_test = ['spitfire', 'bama', 'folijet', 'thunderjet', 'firebird', 'prokopovych', 'vega', 'core_platform', 'falcon']
+  teams_channels = [spitfire: '#spitfire', bama: '#bama', folijet: '#folijet', thunderjet: '#thunderjet-back-end', firebird: '#firebird',
                    prokopovych: '#prokopovych', vega: '#vega', core_platform: '#core-platform', falcon: '#falcon']
 
   // Build status of null means success.

From 2019956e0ccda129537898dc67b4e2c931d5af2c Mon Sep 17 00:00:00 2001
From: Maryia_Lazavik <Maryia_Lazavik@epam.com>
Date: Mon, 21 Mar 2022 08:14:16 +0300
Subject: [PATCH 138/153] RANCHER-192 fix sintax

---
 shared.groovy | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/shared.groovy b/shared.groovy
index 44c7138..7d7af69 100644
--- a/shared.groovy
+++ b/shared.groovy
@@ -365,7 +365,7 @@ def runIntegrationTests(ctx) {
                     prokopovych: ['mod-inventory', 'mod-users-bl', 'edge-patron', 'edge-rtac', 'mod-users'],
                     vega: ['mod-event-config', 'mod-sender', 'mod-circulation', 'mod-template-engine', 'mod-email', 'mod-notify', 'mod-feesfines', 'mod-patron-blocks', 'mod-circulation'],
                     core_platform: ['mod-configuration', 'mod-permissions', 'mod-login-saml', 'mod-user-import'],
-                    falcon: ['mod-search']
+                    falcon: ['mod-search'],
                     bama: ['mod-calendar']
                     ]
     dir("${env.WORKSPACE}/folio-integration-tests/cucumber-reports"){

From 1017754e61b6c1d2af2ac94515667528c4075baf Mon Sep 17 00:00:00 2001
From: maryialazavik <96044720+MaryiaLazavik@users.noreply.github.com>
Date: Wed, 20 Apr 2022 22:33:06 +0300
Subject: [PATCH 139/153] Rancher 268 add mod-data-export-spring,
 mod-data-export-worker (#206)

* RANCHER-268

* RANCHER-268 add conf mod-data-export-string/worker

* RANCHER-268 add conf mod-data-export-string/worker

* RANCHER-268 add conf mod-data-export-string/worker

* RANCHER-268 add conf mod-data-export-string/worker

* RANCHER-268 add conf mod-data-export-string/worker

* RANCHER-268 add conf mod-data-export-string/worker

* RANCHER-268 add conf mod-data-export-string/worker

* RANCHER-268 add conf mod-data-export-string/worker

* RANCHER-268 add conf mod-data-export-string/worker
---
 config/mod-data-export-spring.sh |  1 +
 shared.groovy                    | 27 +++++++++++++++++++--------
 2 files changed, 20 insertions(+), 8 deletions(-)
 create mode 100644 config/mod-data-export-spring.sh

diff --git a/config/mod-data-export-spring.sh b/config/mod-data-export-spring.sh
new file mode 100644
index 0000000..4bed89e
--- /dev/null
+++ b/config/mod-data-export-spring.sh
@@ -0,0 +1 @@
+docker run -d --rm --name ${modName} --mount type=bind,source=/tmp/folio-conf,target=/folio-conf -e 'OKAPI_URL=http://${okapiIp}:9130' -e 'ENV=${envName}' -e 'DB_HOST=${dbHost}' -e 'DB_PORT=5432' -e 'DB_DATABASE=folio' -e 'DB_USERNAME=folio' -e 'DB_PASSWORD=folioadmin' -e 'KAFKA_HOST=${dbHost}' -e 'KAFKA_PORT=9092' -e 'ELASTICSEARCH_HOST=${dbHost}' -e 'ELASTICSEARCH_PORT=9301' -e 'JAVA_OPTIONS=-Dorg.folio.metadata.inventory.storage.type=okapi' -p${port}:8081 folioci/${modName}:${modVer} db_connection=/folio-conf/pg.json 
\ No newline at end of file
diff --git a/shared.groovy b/shared.groovy
index 7d7af69..912b39d 100644
--- a/shared.groovy
+++ b/shared.groovy
@@ -361,7 +361,7 @@ def runIntegrationTests(ctx) {
     team_modules = [spitfire: ['mod-kb-ebsco-java', 'tags', 'codexekb', 'mod-notes', 'mod-quick-marc', 'passwordvalidator'],
                     folijet: ['mod-source-record-storage', 'mod-source-record-manager', 'mod-data-import', 'data-import', 'mod-data-import-converter-storage'],
                     thunderjet: ['mod-finance', 'edge-orders', 'mod-gobi', 'mod-orders', 'mod-organizations', 'mod-invoice', 'mod-ebsconet', 'cross-modules'],
-                    firebird: ['mod-audit', 'edge-dematic', 'edge-caiasoft', 'dataexport', 'oaipmh'],
+                    firebird: ['mod-audit', 'edge-dematic', 'edge-caiasoft', 'dataexport', 'oaipmh', 'mod-data-export-spring', 'mod-data-export-wroker'],
                     prokopovych: ['mod-inventory', 'mod-users-bl', 'edge-patron', 'edge-rtac', 'mod-users'],
                     vega: ['mod-event-config', 'mod-sender', 'mod-circulation', 'mod-template-engine', 'mod-email', 'mod-notify', 'mod-feesfines', 'mod-patron-blocks', 'mod-circulation'],
                     core_platform: ['mod-configuration', 'mod-permissions', 'mod-login-saml', 'mod-user-import'],
@@ -490,13 +490,13 @@ def getMods(fixedMods, mdRepo) {
 
     // registering in Okapi issue
     // should be fixed later
-    if (mod.id.startsWith("mod-data-export-spring")) {
-      continue
-    }
+  //   if (mod.id.startsWith("mod-data-export-spring")) {
+  //     continue
+  //   }
 
-	if (mod.id.startsWith("mod-data-export-worker")) {
-      continue
-    }
+	// if (mod.id.startsWith("mod-data-export-worker")) {
+  //     continue
+  //   }
 	if (mod.id.startsWith("mod-service-interaction")) {
       continue
     }
@@ -638,6 +638,17 @@ def deployMods(envName, mods, okapiIp, modsIp, modsPvtIp, dbPvtIp, tenant, sshCm
       modJob = readFile("config/mod-data-import-converter-storage.sh").trim()
       modJob = modJob.replace('${dbHost}', dbPvtIp)
     }
+    // mod-data-export-string, mod-data-export-worker has different env variables
+    if (modName.equals("mod-data-export-spring") ||
+      modName.equals("mod-data-export-worker")) {
+      modJob = readFile("config/mod-data-export-spring.sh").trim()
+      modJob = modJob.replace('${dbHost}', dbPvtIp)
+      modJob = modJob.replace('${okapiIp}', okapiIp)
+      modJob = modJob.replace('${envName}', envName)
+      modJob = modJob.replace('${port}', '' + port)
+      modJob = modJob.replace('${modVer}', "" + modVer)
+      modJob = modJob.replace('${modName}', modName)
+    }
     // mod-bursar-export and mod-password-validator have different env variables
     if (modName.equals("mod-bursar-export") ||
     modName.equals("mod-password-validator") ||
@@ -807,4 +818,4 @@ def notifySlack(String buildStatus = 'STARTED') {
   }
 }
 
-return this
+return this
\ No newline at end of file

From de9f110135778127cbb6bd8d658290cd468c46af Mon Sep 17 00:00:00 2001
From: maryialazavik <96044720+MaryiaLazavik@users.noreply.github.com>
Date: Tue, 26 Apr 2022 11:02:29 +0300
Subject: [PATCH 140/153] change db_username to conf/mod-inventory-storage

---
 config/mod-inventory-storage.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/config/mod-inventory-storage.sh b/config/mod-inventory-storage.sh
index 232bc6a..855d3c9 100644
--- a/config/mod-inventory-storage.sh
+++ b/config/mod-inventory-storage.sh
@@ -1 +1 @@
-docker run -d --rm --name ${modName} --mount type=bind,source=/tmp/folio-conf,target=/folio-conf -e 'OKAPI_URL=http://${okapiIp}:9130' -e 'ENV=${envName}' -e 'DB_HOST=${dbHost}' -e 'DB_PORT=5432' -e 'DB_DATABASE=folio' -e 'DB_USERNAME=folio' -e 'DB_PASSWORD=folioadmin' -e 'KAFKA_HOST=${dbHost}' -e 'KAFKA_PORT=9092' -e 'JAVA_OPTIONS=-Dorg.folio.metadata.inventory.storage.type=okapi' -p${port}:8081 folioci/${modName}:${modVer} db_connection=/folio-conf/pg.json 
+docker run -d --rm --name ${modName} --mount type=bind,source=/tmp/folio-conf,target=/folio-conf -e 'OKAPI_URL=http://${okapiIp}:9130' -e 'ENV=${envName}' -e 'DB_HOST=${dbHost}' -e 'DB_PORT=5432' -e 'DB_DATABASE=folio' -e 'DB_USERNAME=folio_admin' -e 'DB_PASSWORD=folioadmin' -e 'KAFKA_HOST=${dbHost}' -e 'KAFKA_PORT=9092' -e 'JAVA_OPTIONS=-Dorg.folio.metadata.inventory.storage.type=okapi' -p${port}:8081 folioci/${modName}:${modVer} db_connection=/folio-conf/pg.json 

From 633b29ac5843dced610b494e3904ef3c3acbfc64 Mon Sep 17 00:00:00 2001
From: maryialazavik <96044720+MaryiaLazavik@users.noreply.github.com>
Date: Tue, 26 Apr 2022 12:43:40 +0300
Subject: [PATCH 141/153] Update mod-inventory-storage.sh

---
 config/mod-inventory-storage.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/config/mod-inventory-storage.sh b/config/mod-inventory-storage.sh
index 855d3c9..232bc6a 100644
--- a/config/mod-inventory-storage.sh
+++ b/config/mod-inventory-storage.sh
@@ -1 +1 @@
-docker run -d --rm --name ${modName} --mount type=bind,source=/tmp/folio-conf,target=/folio-conf -e 'OKAPI_URL=http://${okapiIp}:9130' -e 'ENV=${envName}' -e 'DB_HOST=${dbHost}' -e 'DB_PORT=5432' -e 'DB_DATABASE=folio' -e 'DB_USERNAME=folio_admin' -e 'DB_PASSWORD=folioadmin' -e 'KAFKA_HOST=${dbHost}' -e 'KAFKA_PORT=9092' -e 'JAVA_OPTIONS=-Dorg.folio.metadata.inventory.storage.type=okapi' -p${port}:8081 folioci/${modName}:${modVer} db_connection=/folio-conf/pg.json 
+docker run -d --rm --name ${modName} --mount type=bind,source=/tmp/folio-conf,target=/folio-conf -e 'OKAPI_URL=http://${okapiIp}:9130' -e 'ENV=${envName}' -e 'DB_HOST=${dbHost}' -e 'DB_PORT=5432' -e 'DB_DATABASE=folio' -e 'DB_USERNAME=folio' -e 'DB_PASSWORD=folioadmin' -e 'KAFKA_HOST=${dbHost}' -e 'KAFKA_PORT=9092' -e 'JAVA_OPTIONS=-Dorg.folio.metadata.inventory.storage.type=okapi' -p${port}:8081 folioci/${modName}:${modVer} db_connection=/folio-conf/pg.json 

From 67a247619899713a114d1257c1dc246f311eb2e9 Mon Sep 17 00:00:00 2001
From: Maryia_Lazavik <Maryia_Lazavik@epam.com>
Date: Tue, 26 Apr 2022 13:23:59 +0300
Subject: [PATCH 142/153] add mod-source-record-manager folio_admin

---
 config/mod-source-record-manager.sh |  0
 shared.groovy                       | 13 +++++++++++--
 2 files changed, 11 insertions(+), 2 deletions(-)
 create mode 100644 config/mod-source-record-manager.sh

diff --git a/config/mod-source-record-manager.sh b/config/mod-source-record-manager.sh
new file mode 100644
index 0000000..e69de29
diff --git a/shared.groovy b/shared.groovy
index 912b39d..9c00984 100644
--- a/shared.groovy
+++ b/shared.groovy
@@ -620,17 +620,26 @@ def deployMods(envName, mods, okapiIp, modsIp, modsPvtIp, dbPvtIp, tenant, sshCm
         modJob = modJob.replace('8080', '8081')
       }
     }
-    // mod-inventory-storage, mod-source-record-storage and mod-ebsconet have different env variables
+    // mod-inventory-storage and mod-ebsconet have different env variables
     if (modName.equals("mod-inventory-storage") ||
     modName.equals("mod-source-record-storage") ||
     modName.equals("mod-ebsconet") ||
-    modName.equals("mod-source-record-manager") ||
     modName.equals("mod-data-import")) {
       modJob = readFile("config/mod-inventory-storage.sh").trim()
       modJob = modJob.replace('${dbHost}', dbPvtIp)
       modJob = modJob.replace('${okapiIp}', okapiIp)
       modJob = modJob.replace('${envName}', envName)
     }
+    // mod-source-record-storage  has different env variables
+    if (modName.equals("mod-source-record-manager") {
+      modJob = readFile("config/mod-source-record-manager.sh").trim()
+      modJob = modJob.replace('${dbHost}', dbPvtIp)
+      modJob = modJob.replace('${okapiIp}', okapiIp)
+      modJob = modJob.replace('${envName}', envName)
+      modJob = modJob.replace('${port}', '' + port)
+      modJob = modJob.replace('${modVer}', "" + modVer)
+      modJob = modJob.replace('${modName}', modName)
+    }
     // mod-data-import-converter-storage, users has different env variables
     if (modName.equals("mod-data-import-converter-storage") ||
     modName.equals("mod-users") ||

From a0c06d170bd255a92ff5e031fe92acb485cb086f Mon Sep 17 00:00:00 2001
From: Maryia_Lazavik <Maryia_Lazavik@epam.com>
Date: Tue, 26 Apr 2022 13:31:59 +0300
Subject: [PATCH 143/153] add mod-source-record-manager folio_admin

---
 shared.groovy | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/shared.groovy b/shared.groovy
index 9c00984..a80f01f 100644
--- a/shared.groovy
+++ b/shared.groovy
@@ -631,7 +631,7 @@ def deployMods(envName, mods, okapiIp, modsIp, modsPvtIp, dbPvtIp, tenant, sshCm
       modJob = modJob.replace('${envName}', envName)
     }
     // mod-source-record-storage  has different env variables
-    if (modName.equals("mod-source-record-manager") {
+    if (modName.equals("mod-source-record-manager")) {
       modJob = readFile("config/mod-source-record-manager.sh").trim()
       modJob = modJob.replace('${dbHost}', dbPvtIp)
       modJob = modJob.replace('${okapiIp}', okapiIp)

From a18025234137248b92f8bc29ef6bba1c1b838ec8 Mon Sep 17 00:00:00 2001
From: maryialazavik <96044720+MaryiaLazavik@users.noreply.github.com>
Date: Tue, 26 Apr 2022 13:43:53 +0300
Subject: [PATCH 144/153] update mod-source-manager.sh

---
 config/mod-source-record-manager.sh | 1 +
 1 file changed, 1 insertion(+)

diff --git a/config/mod-source-record-manager.sh b/config/mod-source-record-manager.sh
index e69de29..cfab221 100644
--- a/config/mod-source-record-manager.sh
+++ b/config/mod-source-record-manager.sh
@@ -0,0 +1 @@
+docker run -d --rm --name ${modName} --mount type=bind,source=/tmp/folio-conf,target=/folio-conf -e 'OKAPI_URL=http://${okapiIp}:9130' -e 'ENV=${envName}' -e 'DB_HOST=${dbHost}' -e 'DB_PORT=5432' -e 'DB_DATABASE=folio' -e 'DB_USERNAME=folio_admin' -e 'DB_PASSWORD=folioadmin' -e 'KAFKA_HOST=${dbHost}' -e 'KAFKA_PORT=9092' -e 'JAVA_OPTIONS=-Dorg.folio.metadata.inventory.storage.type=okapi' -p${port}:8081 folioci/${modName}:${modVer} db_connection=/folio-conf/pg.json 

From 7b12e051870260f80ec63514851e2bada225373c Mon Sep 17 00:00:00 2001
From: maryialazavik <96044720+MaryiaLazavik@users.noreply.github.com>
Date: Tue, 26 Apr 2022 13:59:05 +0300
Subject: [PATCH 145/153] change mod-source-manager.sh

---
 config/mod-source-record-manager.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/config/mod-source-record-manager.sh b/config/mod-source-record-manager.sh
index cfab221..35d9819 100644
--- a/config/mod-source-record-manager.sh
+++ b/config/mod-source-record-manager.sh
@@ -1 +1 @@
-docker run -d --rm --name ${modName} --mount type=bind,source=/tmp/folio-conf,target=/folio-conf -e 'OKAPI_URL=http://${okapiIp}:9130' -e 'ENV=${envName}' -e 'DB_HOST=${dbHost}' -e 'DB_PORT=5432' -e 'DB_DATABASE=folio' -e 'DB_USERNAME=folio_admin' -e 'DB_PASSWORD=folioadmin' -e 'KAFKA_HOST=${dbHost}' -e 'KAFKA_PORT=9092' -e 'JAVA_OPTIONS=-Dorg.folio.metadata.inventory.storage.type=okapi' -p${port}:8081 folioci/${modName}:${modVer} db_connection=/folio-conf/pg.json 
+docker run -d --rm --name ${modName} --mount type=bind,source=/tmp/folio-conf,target=/folio-conf -e 'OKAPI_URL=http://${okapiIp}:9130' -e 'ENV=${envName}' -e 'DB_HOST=${dbHost}' -e 'DB_PORT=5432' -e 'DB_DATABASE=folio' -e 'DB_USERNAME=folio' -e 'DB_PASSWORD=folioadmin' -e 'KAFKA_HOST=${dbHost}' -e 'KAFKA_PORT=9092' -e 'JAVA_OPTIONS=-Dorg.folio.metadata.inventory.storage.type=okapi' -p${port}:8081 folioci/${modName}:${modVer} db_connection=/folio-conf/pg.json 

From 57839c1ac7c2da3b69b171e249c473b8902fd058 Mon Sep 17 00:00:00 2001
From: maryialazavik <96044720+MaryiaLazavik@users.noreply.github.com>
Date: Tue, 26 Apr 2022 14:02:38 +0300
Subject: [PATCH 146/153] put away team to slack notify thunderjet

---
 shared.groovy | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/shared.groovy b/shared.groovy
index a80f01f..7dbfa64 100644
--- a/shared.groovy
+++ b/shared.groovy
@@ -794,8 +794,8 @@ def stopFolioDockers(ctx, ip) {
 }
 
 def notifySlack(String buildStatus = 'STARTED') {
-  teams_test = ['spitfire', 'bama', 'folijet', 'thunderjet', 'firebird', 'prokopovych', 'vega', 'core_platform', 'falcon']
-  teams_channels = [spitfire: '#spitfire', bama: '#bama', folijet: '#folijet', thunderjet: '#thunderjet-back-end', firebird: '#firebird',
+  teams_test = ['spitfire', 'bama', 'folijet', 'firebird', 'prokopovych', 'vega', 'core_platform', 'falcon']
+  teams_channels = [spitfire: '#spitfire', bama: '#bama', folijet: '#folijet', firebird: '#firebird',
                    prokopovych: '#prokopovych', vega: '#vega', core_platform: '#core-platform', falcon: '#falcon']
 
   // Build status of null means success.
@@ -827,4 +827,4 @@ def notifySlack(String buildStatus = 'STARTED') {
   }
 }
 
-return this
\ No newline at end of file
+return this

From c7c54198b4e3ca484cfa6dca105e5f3b125fb961 Mon Sep 17 00:00:00 2001
From: maryialazavik <96044720+MaryiaLazavik@users.noreply.github.com>
Date: Thu, 19 May 2022 13:13:37 +0300
Subject: [PATCH 147/153] RANCHER-292 turn off slack folijet team

---
 shared.groovy | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/shared.groovy b/shared.groovy
index 7dbfa64..c9f5e6c 100644
--- a/shared.groovy
+++ b/shared.groovy
@@ -794,8 +794,8 @@ def stopFolioDockers(ctx, ip) {
 }
 
 def notifySlack(String buildStatus = 'STARTED') {
-  teams_test = ['spitfire', 'bama', 'folijet', 'firebird', 'prokopovych', 'vega', 'core_platform', 'falcon']
-  teams_channels = [spitfire: '#spitfire', bama: '#bama', folijet: '#folijet', firebird: '#firebird',
+  teams_test = ['spitfire', 'bama', 'firebird', 'prokopovych', 'vega', 'core_platform', 'falcon']
+  teams_channels = [spitfire: '#spitfire', bama: '#bama', firebird: '#firebird',
                    prokopovych: '#prokopovych', vega: '#vega', core_platform: '#core-platform', falcon: '#falcon']
 
   // Build status of null means success.

From 22da7da31418cb9caf82f39edc023f95c73d5f42 Mon Sep 17 00:00:00 2001
From: maryialazavik <96044720+MaryiaLazavik@users.noreply.github.com>
Date: Tue, 24 May 2022 15:01:39 +0300
Subject: [PATCH 148/153] FAT-1693 add for notif bulk-edit

---
 shared.groovy | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/shared.groovy b/shared.groovy
index c9f5e6c..211ae34 100644
--- a/shared.groovy
+++ b/shared.groovy
@@ -361,7 +361,7 @@ def runIntegrationTests(ctx) {
     team_modules = [spitfire: ['mod-kb-ebsco-java', 'tags', 'codexekb', 'mod-notes', 'mod-quick-marc', 'passwordvalidator'],
                     folijet: ['mod-source-record-storage', 'mod-source-record-manager', 'mod-data-import', 'data-import', 'mod-data-import-converter-storage'],
                     thunderjet: ['mod-finance', 'edge-orders', 'mod-gobi', 'mod-orders', 'mod-organizations', 'mod-invoice', 'mod-ebsconet', 'cross-modules'],
-                    firebird: ['mod-audit', 'edge-dematic', 'edge-caiasoft', 'dataexport', 'oaipmh', 'mod-data-export-spring', 'mod-data-export-wroker'],
+                    firebird: ['mod-audit', 'bulk-edit', 'edge-dematic', 'edge-caiasoft', 'data-export', 'oaipmh', 'mod-data-export-spring', 'mod-data-export-worker'],
                     prokopovych: ['mod-inventory', 'mod-users-bl', 'edge-patron', 'edge-rtac', 'mod-users'],
                     vega: ['mod-event-config', 'mod-sender', 'mod-circulation', 'mod-template-engine', 'mod-email', 'mod-notify', 'mod-feesfines', 'mod-patron-blocks', 'mod-circulation'],
                     core_platform: ['mod-configuration', 'mod-permissions', 'mod-login-saml', 'mod-user-import'],
@@ -794,8 +794,8 @@ def stopFolioDockers(ctx, ip) {
 }
 
 def notifySlack(String buildStatus = 'STARTED') {
-  teams_test = ['spitfire', 'bama', 'firebird', 'prokopovych', 'vega', 'core_platform', 'falcon']
-  teams_channels = [spitfire: '#spitfire', bama: '#bama', firebird: '#firebird',
+  teams_test = ['spitfire', 'bama', 'firebird', 'prokopovych', 'folijet' 'vega', 'core_platform', 'falcon']
+  teams_channels = [spitfire: '#spitfire', bama: '#bama', firebird: '#firebird', folijet: '#folijet-test'
                    prokopovych: '#prokopovych', vega: '#vega', core_platform: '#core-platform', falcon: '#falcon']
 
   // Build status of null means success.

From 8b06b13ee442c58b7651552fa98eebf3d16f43a2 Mon Sep 17 00:00:00 2001
From: maryialazavik <96044720+MaryiaLazavik@users.noreply.github.com>
Date: Wed, 25 May 2022 08:10:54 +0300
Subject: [PATCH 149/153] fix sintax

---
 shared.groovy | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/shared.groovy b/shared.groovy
index 211ae34..e443419 100644
--- a/shared.groovy
+++ b/shared.groovy
@@ -794,7 +794,7 @@ def stopFolioDockers(ctx, ip) {
 }
 
 def notifySlack(String buildStatus = 'STARTED') {
-  teams_test = ['spitfire', 'bama', 'firebird', 'prokopovych', 'folijet' 'vega', 'core_platform', 'falcon']
+  teams_test = ['spitfire', 'bama', 'firebird', 'prokopovych', 'folijet', 'vega', 'core_platform', 'falcon']
   teams_channels = [spitfire: '#spitfire', bama: '#bama', firebird: '#firebird', folijet: '#folijet-test'
                    prokopovych: '#prokopovych', vega: '#vega', core_platform: '#core-platform', falcon: '#falcon']
 

From 4b9a8a7e375e02a970a04f3e49311155a7216174 Mon Sep 17 00:00:00 2001
From: maryialazavik <96044720+MaryiaLazavik@users.noreply.github.com>
Date: Wed, 25 May 2022 08:11:35 +0300
Subject: [PATCH 150/153] fix sintax

---
 shared.groovy | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/shared.groovy b/shared.groovy
index e443419..53b9e88 100644
--- a/shared.groovy
+++ b/shared.groovy
@@ -795,7 +795,7 @@ def stopFolioDockers(ctx, ip) {
 
 def notifySlack(String buildStatus = 'STARTED') {
   teams_test = ['spitfire', 'bama', 'firebird', 'prokopovych', 'folijet', 'vega', 'core_platform', 'falcon']
-  teams_channels = [spitfire: '#spitfire', bama: '#bama', firebird: '#firebird', folijet: '#folijet-test'
+  teams_channels = [spitfire: '#spitfire', bama: '#bama', firebird: '#firebird', folijet: '#folijet-test',
                    prokopovych: '#prokopovych', vega: '#vega', core_platform: '#core-platform', falcon: '#falcon']
 
   // Build status of null means success.

From a6b08cbca6bda3ad5971519404a63b2917f38366 Mon Sep 17 00:00:00 2001
From: maryialazavik <96044720+MaryiaLazavik@users.noreply.github.com>
Date: Wed, 25 May 2022 22:29:31 +0300
Subject: [PATCH 151/153] fix dataexport

---
 shared.groovy | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/shared.groovy b/shared.groovy
index 53b9e88..1794bf5 100644
--- a/shared.groovy
+++ b/shared.groovy
@@ -361,7 +361,7 @@ def runIntegrationTests(ctx) {
     team_modules = [spitfire: ['mod-kb-ebsco-java', 'tags', 'codexekb', 'mod-notes', 'mod-quick-marc', 'passwordvalidator'],
                     folijet: ['mod-source-record-storage', 'mod-source-record-manager', 'mod-data-import', 'data-import', 'mod-data-import-converter-storage'],
                     thunderjet: ['mod-finance', 'edge-orders', 'mod-gobi', 'mod-orders', 'mod-organizations', 'mod-invoice', 'mod-ebsconet', 'cross-modules'],
-                    firebird: ['mod-audit', 'bulk-edit', 'edge-dematic', 'edge-caiasoft', 'data-export', 'oaipmh', 'mod-data-export-spring', 'mod-data-export-worker'],
+                    firebird: ['mod-audit', 'bulk-edit', 'edge-dematic', 'edge-caiasoft', 'dataexport', 'oaipmh', 'mod-data-export-spring', 'mod-data-export-worker'],
                     prokopovych: ['mod-inventory', 'mod-users-bl', 'edge-patron', 'edge-rtac', 'mod-users'],
                     vega: ['mod-event-config', 'mod-sender', 'mod-circulation', 'mod-template-engine', 'mod-email', 'mod-notify', 'mod-feesfines', 'mod-patron-blocks', 'mod-circulation'],
                     core_platform: ['mod-configuration', 'mod-permissions', 'mod-login-saml', 'mod-user-import'],

From 02606589fd81d320a8acd9a11f57b81bf0718cd5 Mon Sep 17 00:00:00 2001
From: maryialazavik <96044720+MaryiaLazavik@users.noreply.github.com>
Date: Thu, 26 May 2022 15:48:15 +0300
Subject: [PATCH 152/153] add mod-search to spitfire

---
 shared.groovy | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/shared.groovy b/shared.groovy
index 1794bf5..7a02012 100644
--- a/shared.groovy
+++ b/shared.groovy
@@ -358,14 +358,13 @@ def runIntegrationTests(ctx) {
     teams = ['thunderjet', 'bama', 'firebird', 'prokopovych', 'folijet', 'spitfire', 'vega', 'core-platform', 'erm-delivery', 'fse', 'stripes', 'leipzig',
              'ncip', 'thor', 'falcon', 'volaris', 'knowledgeware', 'spring']
     teams_test = ['spitfire', 'bama', 'folijet', 'thunderjet', 'firebird', 'prokopovych', 'vega', 'core_platform', 'falcon']
-    team_modules = [spitfire: ['mod-kb-ebsco-java', 'tags', 'codexekb', 'mod-notes', 'mod-quick-marc', 'passwordvalidator'],
+    team_modules = [spitfire: ['mod-kb-ebsco-java', 'tags', 'codexekb', 'mod-notes', 'mod-quick-marc', 'mod-search',  'passwordvalidator'],
                     folijet: ['mod-source-record-storage', 'mod-source-record-manager', 'mod-data-import', 'data-import', 'mod-data-import-converter-storage'],
                     thunderjet: ['mod-finance', 'edge-orders', 'mod-gobi', 'mod-orders', 'mod-organizations', 'mod-invoice', 'mod-ebsconet', 'cross-modules'],
                     firebird: ['mod-audit', 'bulk-edit', 'edge-dematic', 'edge-caiasoft', 'dataexport', 'oaipmh', 'mod-data-export-spring', 'mod-data-export-worker'],
                     prokopovych: ['mod-inventory', 'mod-users-bl', 'edge-patron', 'edge-rtac', 'mod-users'],
                     vega: ['mod-event-config', 'mod-sender', 'mod-circulation', 'mod-template-engine', 'mod-email', 'mod-notify', 'mod-feesfines', 'mod-patron-blocks', 'mod-circulation'],
                     core_platform: ['mod-configuration', 'mod-permissions', 'mod-login-saml', 'mod-user-import'],
-                    falcon: ['mod-search'],
                     bama: ['mod-calendar']
                     ]
     dir("${env.WORKSPACE}/folio-integration-tests/cucumber-reports"){

From 196b69ea1ce775d5b0adc720a6e758c31740d636 Mon Sep 17 00:00:00 2001
From: maryialazavik <96044720+MaryiaLazavik@users.noreply.github.com>
Date: Fri, 27 May 2022 14:23:29 +0300
Subject: [PATCH 153/153] fix falcon team

---
 shared.groovy | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/shared.groovy b/shared.groovy
index 7a02012..4c03ef5 100644
--- a/shared.groovy
+++ b/shared.groovy
@@ -356,8 +356,8 @@ def runIntegrationTests(ctx) {
     sh "mkdir ${env.WORKSPACE}/folio-integration-tests/cucumber-reports"
     sh "find . | grep json | grep '/target/karate-reports' | xargs -i cp {} ${env.WORKSPACE}/folio-integration-tests/cucumber-reports"
     teams = ['thunderjet', 'bama', 'firebird', 'prokopovych', 'folijet', 'spitfire', 'vega', 'core-platform', 'erm-delivery', 'fse', 'stripes', 'leipzig',
-             'ncip', 'thor', 'falcon', 'volaris', 'knowledgeware', 'spring']
-    teams_test = ['spitfire', 'bama', 'folijet', 'thunderjet', 'firebird', 'prokopovych', 'vega', 'core_platform', 'falcon']
+             'ncip', 'thor', 'volaris', 'knowledgeware', 'spring']
+    teams_test = ['spitfire', 'bama', 'folijet', 'thunderjet', 'firebird', 'prokopovych', 'vega', 'core_platform']
     team_modules = [spitfire: ['mod-kb-ebsco-java', 'tags', 'codexekb', 'mod-notes', 'mod-quick-marc', 'mod-search',  'passwordvalidator'],
                     folijet: ['mod-source-record-storage', 'mod-source-record-manager', 'mod-data-import', 'data-import', 'mod-data-import-converter-storage'],
                     thunderjet: ['mod-finance', 'edge-orders', 'mod-gobi', 'mod-orders', 'mod-organizations', 'mod-invoice', 'mod-ebsconet', 'cross-modules'],
@@ -793,9 +793,9 @@ def stopFolioDockers(ctx, ip) {
 }
 
 def notifySlack(String buildStatus = 'STARTED') {
-  teams_test = ['spitfire', 'bama', 'firebird', 'prokopovych', 'folijet', 'vega', 'core_platform', 'falcon']
+  teams_test = ['spitfire', 'bama', 'firebird', 'prokopovych', 'folijet', 'vega', 'core_platform']
   teams_channels = [spitfire: '#spitfire', bama: '#bama', firebird: '#firebird', folijet: '#folijet-test',
-                   prokopovych: '#prokopovych', vega: '#vega', core_platform: '#core-platform', falcon: '#falcon']
+                   prokopovych: '#prokopovych', vega: '#vega', core_platform: '#core-platform']
 
   // Build status of null means success.
   buildStatus = buildStatus ?: 'SUCCESS'