Merge "Release Guilin 7.0.0 container"

diff --git a/INFO.yaml b/INFO.yaml
index 8604648..0dc1289 100644 (file)
--- a/INFO.yaml
+++ b/INFO.yaml
@@ -44,7 +44,7 @@ meetings:
       repeats: 'weekly'
       time: '14:00 UTC'
 repositories:
-    - 'externalapi-nbi'
+    - 'externalapi/nbi'
 committers:
     - <<: *onap_releng_ptl
     - name: 'Andy Mayer'
@@ -52,16 +52,6 @@ committers:
       id: 'ajmayer'
       company: 'ATT'
       timezone: 'America/New_York'
-    - name: 'Raluca Sirbu'
-      email: 'rs2184@att.com'
-      id: ''
-      company: 'ATT'
-      timezone: 'America/New_York'
-    - name: 'Mark Gibson'
-      email: 'markgi@amdocs.com'
-      id: ''
-      company: 'Amdocs'
-      timezone: 'Europe/London'
     - name: 'Eric Debeau'
       email: 'eric.debeau@orange.com'
       id: 'eric.debeau'

diff --git a/releases/7.0.0.yaml b/releases/7.0.0.yaml
new file mode 100644 (file)
index 0000000..b681526
--- /dev/null
+++ b/releases/7.0.0.yaml
@@ -0,0 +1,5 @@
+---
+distribution_type: 'maven'
+version: '7.0.0'
+project: 'externalapi-nbi'
+log_dir: 'externalapi-nbi-maven-stage-master/430/'

diff --git a/src/test/resources/karatetest/features/00--ServiceCatalog.feature b/src/test/resources/karatetest/features/00--ServiceCatalog.feature
index 4894c99..2a4a5c0 100644 (file)
--- a/src/test/resources/karatetest/features/00--ServiceCatalog.feature
+++ b/src/test/resources/karatetest/features/00--ServiceCatalog.feature
@@ -20,6 +20,7 @@ Feature: Service Catalog
 Background:
 * url nbiBaseUrl
 * def Context = Java.type('org.onap.nbi.test.Context');
+* configure readTimeout = 30000
 * call Context.startServers();
     
 Scenario: testServiceCatalogGetResourceWithoutTosca