Fix rpm build error

- Fix common rpm spec syntax error
- Fix build.sh check for spec file changes.

Change-Id: I84b54c87356a092af480957ad4b2e93ec577539b
Signed-off-by: Feng Pan <fpan@redhat.com>

diff --git a/build/opnfv-apex-common.spec b/build/opnfv-apex-common.spec
index 6067c7e..327df3b 100644 (file)
--- a/build/opnfv-apex-common.spec
+++ b/build/opnfv-apex-common.spec
@@ -48,7 +48,15 @@ install lib/common-functions.sh %{buildroot}%{_var}/opt/opnfv/lib/
 install lib/utility-functions.sh %{buildroot}%{_var}/opt/opnfv/lib/
 install lib/python/apex-python-utils.py %{buildroot}%{_var}/opt/opnfv/lib/python/
 mkdir -p %{buildroot}%{python3_sitelib}/apex/
-install lib/python/apex/ %{buildroot}%{python3_sitelib}/apex/
+install lib/python/apex/__init__.py %{buildroot}%{python3_sitelib}/apex/
+install lib/python/apex/deploy_env.py %{buildroot}%{python3_sitelib}/apex/
+install lib/python/apex/ip_utils.py %{buildroot}%{python3_sitelib}/apex/
+install lib/python/apex/network_environment.py %{buildroot}%{python3_sitelib}/apex/
+install lib/python/apex/network_settings.py %{buildroot}%{python3_sitelib}/apex/
+mkdir -p %{buildroot}%{python3_sitelib}/apex/common
+install lib/python/apex/common/__init__.py %{buildroot}%{python3_sitelib}/apex/common/
+install lib/python/apex/common/constants.py %{buildroot}%{python3_sitelib}/apex/common/
+install lib/python/apex/common/utils.py %{buildroot}%{python3_sitelib}/apex/common/
 mkdir -p %{buildroot}%{_var}/opt/opnfv/lib/installer/onos/
 install lib/installer/onos/onos_gw_mac_update.sh %{buildroot}%{_var}/opt/opnfv/lib/installer/onos/
 

diff --git a/ci/build.sh b/ci/build.sh
index dec7376..dd9f9fd 100755 (executable)
--- a/ci/build.sh
+++ b/ci/build.sh
@@ -121,16 +121,16 @@ if [[ "$MAKE_TARGETS" == "images" ]]; then
         if [[ $commit_file_list == *build/opnfv-apex-undercloud.spec* ]]; then
             MAKE_TARGETS+=" undercloud-rpm-check"
         fi
-        if [[ $commit_file_list == *build/opnfv-apex.spec* ]]; then
+        if [[ $commit_file_list == *build/opnfv-apex-common.spec* ]]; then
             MAKE_TARGETS+=" common-rpm-check"
         fi
         if [[ $commit_file_list == *build/opnfv-apex.spec* ]]; then
             MAKE_TARGETS+=" opendaylight-rpm-check"
         fi
-        if [[ $commit_file_list == *build/opnfv-apex.spec* ]]; then
+        if [[ $commit_file_list == *build/opnfv-apex-onos.spec* ]]; then
             MAKE_TARGETS+=" onos-rpm-check"
         fi
-        if [[ $commit_file_list == *build/opnfv-apex.spec* ]]; then
+        if [[ $commit_file_list == *build/opnfv-apex-opendaylight-sfc.spec* ]]; then
             MAKE_TARGETS+=" opendaylight-sfc-rpm-check"
         fi
     fi