Merge "update descriptor-packages build process"

diff --git a/jenkins/RO/install b/jenkins/RO/install
index 9eb555c..2f3ca93 100755 (executable)
--- a/jenkins/RO/install
+++ b/jenkins/RO/install
@@ -33,11 +33,11 @@ OSM_load_config
 #Release TWO
 
 apt-get update
-apt-get -y install python-lib-osm-openvim
 apt-get -y install python-osm-ro
 
-OSMLIBOVIM_PATH=`python -c 'import lib_osm_openvim; print lib_osm_openvim.__path__[0]'` || FATAL "lib-osm-openvim was not properly installed"
-OSMRO_PATH=`python -c 'import osm_ro; print osm_ro.__path__[0]'` || FATAL "osm-ro was not properly installed"
+OSMIM_PATH=`python -c 'import osm_im; print osm_im.__path__[0]'` || FATAL "python-osm-im was not properly installed"
+OSMLIBOVIM_PATH=`python -c 'import lib_osm_openvim; print lib_osm_openvim.__path__[0]'` || FATAL "python-lib-osm-openvim was not properly installed"
+OSMRO_PATH=`python -c 'import osm_ro; print osm_ro.__path__[0]'` || FATAL "python-osm-ro was not properly installed"
 
 DEBIAN_FRONTEND=noninteractive ${OSMRO_PATH}/database_utils/install-db-server.sh --updatedb || FATAL "osm-ro db installation failed"
 DEBIAN_FRONTEND=noninteractive ${OSMLIBOVIM_PATH}/database_utils/install-db-server.sh -u mano -p manopw -d mano_vim_db --updatedb || FATAL "lib-osm-openvim db installation failed"

diff --git a/jenkins/ci-pipelines/ci_helper.groovy b/jenkins/ci-pipelines/ci_helper.groovy
index a731267..c047a12 100644 (file)
--- a/jenkins/ci-pipelines/ci_helper.groovy
+++ b/jenkins/ci-pipelines/ci_helper.groovy
@@ -25,7 +25,7 @@ def get_archive(artifactory_server, mdg, branch, build_name, build_number, patte
      "files": [
         {
           "target": "./",
-          "pattern": "${repo_prefix}${mdg}/${pattern}",
+          "pattern": "${repo_prefix}${mdg}/${branch}/${pattern}",
           "build": "${build_name}/${build_number}"
         }
      ]
@@ -33,8 +33,8 @@ def get_archive(artifactory_server, mdg, branch, build_name, build_number, patte
 
     server.download(downloadSpec)
     // workaround.  flatten and repo the specific build num from the directory
-    sh "cp -R ${build_num}/* ."
-    sh "rm -rf ${build_num}"
+    sh "cp -R ${branch}/${build_num}/* ."
+    sh "rm -rf ${branch}/${build_num}"
 }
 
 def get_env_value(build_env_file,key) {
@@ -79,19 +79,19 @@ def archive(artifactory_server,mdg,branch,status) {
      "files": [
         {
           "pattern": "dists/*.gz",
-          "target": "${repo_prefix}${mdg}/${BUILD_NUMBER}/",
+          "target": "${repo_prefix}${mdg}/${branch}/${BUILD_NUMBER}/",
           "props": "${properties}",
           "flat": false
         },
         {
           "pattern": "dists/*Packages",
-          "target": "${repo_prefix}${mdg}/${BUILD_NUMBER}/",
+          "target": "${repo_prefix}${mdg}/${branch}/${BUILD_NUMBER}/",
           "props": "${properties}",
           "flat": false
         },
         {
           "pattern": "pool/*/*.deb",
-          "target": "${repo_prefix}${mdg}/${BUILD_NUMBER}/",
+          "target": "${repo_prefix}${mdg}/${branch}/${BUILD_NUMBER}/",
           "props": "${properties}",
           "flat": false
         }]

diff --git a/jenkins/common/install_common b/jenkins/common/install_common
index d9c1338..2cee862 100755 (executable)
--- a/jenkins/common/install_common
+++ b/jenkins/common/install_common
@@ -45,4 +45,4 @@ key_location=$REPOSITORY_BASE/$RELEASE/$REPOSITORY_KEY
 
 curl $key_location | apt-key add -
 
-apt-get update && add-apt-repository -y "deb $REPOSITORY_BASE/$RELEASE $REPOSITORY SO UI RO osmclient openvim"
+apt-get update && add-apt-repository -y "deb $REPOSITORY_BASE/$RELEASE $REPOSITORY SO UI RO IM osmclient openvim"

diff --git a/systest/lib/openstack/fixtures.py b/systest/lib/openstack/fixtures.py
index 7c1ec7f..e6953b7 100644 (file)
--- a/systest/lib/openstack/fixtures.py
+++ b/systest/lib/openstack/fixtures.py
@@ -28,10 +28,10 @@ def openstack_add_options(parser):
 def openstack(request):
     from lib.openstack import openstack
     access = {}
-    access['os-url'] = request.config.getoption("--os-url")
-    access['os-username'] = request.config.getoption("--os-username")
-    access['os-password'] = request.config.getoption("--os-password")
-    access['os-project-name'] = request.config.getoption("--os-project-name")
+    access['vim-url'] = request.config.getoption("--os-url")
+    access['vim-username'] = request.config.getoption("--os-username")
+    access['vim-password'] = request.config.getoption("--os-password")
+    access['vim-tenant-name'] = request.config.getoption("--os-project-name")
     access['vim-type'] = 'openstack'
     access['description'] = 'pytest system test'
 

diff --git a/systest/lib/vmware/fixtures.py b/systest/lib/vmware/fixtures.py
index b81cdff..78ee80c 100644 (file)
--- a/systest/lib/vmware/fixtures.py
+++ b/systest/lib/vmware/fixtures.py
@@ -36,10 +36,10 @@ def vmware_add_options(parser):
 def vmware(request):
     from lib.vmware import vmware
     access = {}
-    access['vcd-url'] = request.config.getoption("--vcd-url")
-    access['vcd-username'] = request.config.getoption("--vcd-username")
-    access['vcd-password'] = request.config.getoption("--vcd-password")
-    access['vcd-tenant-name'] = request.config.getoption("--vcd-tenant-name")
+    access['vim-url'] = request.config.getoption("--vcd-url")
+    access['vim-username'] = request.config.getoption("--vcd-username")
+    access['vim-password'] = request.config.getoption("--vcd-password")
+    access['vim-tenant-name'] = request.config.getoption("--vcd-tenant-name")
     access['config'] = request.config.getoption("--config")
     access['vim-type'] = 'vmware'
     access['description'] = 'pytest system test'

diff --git a/systest/testcases/vim/test_vim.py b/systest/testcases/vim/test_vim.py
index 5432516..d622753 100644 (file)
--- a/systest/testcases/vim/test_vim.py
+++ b/systest/testcases/vim/test_vim.py
@@ -43,10 +43,10 @@ class TestClass(object):
         resp=osm.get_api().vim.get('pytest')
         assert resp['name'] == 'pytest'
         assert resp['type'] == 'openstack'
-        assert resp['vim_url'] == os_access['os-url']
-        assert resp['vim_url_admin'] == os_access['os-url']
-        assert resp['vim_tenants'][0]['user'] == os_access['os-username']
-        assert resp['vim_tenants'][0]['vim_tenant_name'] == os_access['os-project-name']
+        assert resp['vim_url'] == os_access['vim-url']
+        assert resp['vim_url_admin'] == os_access['vim-url']
+        assert resp['vim_tenants'][0]['user'] == os_access['vim-username']
+        assert resp['vim_tenants'][0]['vim_tenant_name'] == os_access['vim-tenant-name']
 
         assert not osm.get_api().vim.delete('pytest')
 
@@ -58,9 +58,9 @@ class TestClass(object):
         resp=osm.get_api().vim.get('pytest')
         assert resp['name'] == 'pytest'
         assert resp['type'] == 'vmware'
-        assert resp['vim_url'] == os_access['vcd-url']
-        assert resp['vim_url_admin'] == os_access['vcd-url']
-        assert resp['vim_tenants'][0]['user'] == os_access['vcd-username']
-        assert resp['vim_tenants'][0]['vim_tenant_name'] == os_access['vcd-tenant-name']
+        assert resp['vim_url'] == os_access['vim-url']
+        assert resp['vim_url_admin'] == os_access['vim-url']
+        assert resp['vim_tenants'][0]['user'] == os_access['vim-username']
+        assert resp['vim_tenants'][0]['vim_tenant_name'] == os_access['vim-tenant-name']
 
         assert not osm.get_api().vim.delete('pytest')