Folio-2982 Fixed OKAPI version

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'),

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'),

Jenkinsfile.integration

@@ -16,9 +16,9 @@ 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: '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'),
@@ -30,7 +30,7 @@ def context
 
 
 node('jenkins-agent-java11') {
-  timeout(180) {
+  timeout(600) {
 
     stage("Checkout") {
       cleanWs()
@@ -48,7 +48,7 @@ node('jenkins-agent-java11') {
         try {
 
           stage("Create Environment") {
-            sharedLib.notifySlack()
+            // sharedLib.notifySlack()
             sharedLib.createEnv(context)
           }
 
@@ -73,11 +73,11 @@ 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
+          //sleep 1800
           currentBuild.result = 'FAILURE'
           throw e
         } finally {

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'),

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'),

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

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

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" docker.dev.folio.org/folio-elasticsearch:7.10.1

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 '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}

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

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 

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=\'-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

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

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

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}

config/mod-inn-reach.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

config/mod-inventory-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 '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 

config/mod-inventory.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 '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

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'  -p${port}:8081 folioci/${modName}:${modVer}

config/mod-oa.sh

@@ -0,0 +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}

config/mod-search.sh

@@ -0,0 +1 @@
+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}

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/mod-courses:1.2.3-SNAPSHOT.117 db_connection=/folio-conf/pg.json

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' -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 

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