diff options
| author |   Feng Pan <fpan@redhat.com> | 2016-06-04 22:16:29 -0400 |
|---|---|---|
| committer | Feng Pan <fpan@redhat.com> | 2016-06-05 04:04:26 +0000 |
| commit | 0d93a4efa03b046ca98cedb2f7136d725201a2d7 (patch) | |
| tree | b8120ce79fd8de37ef2f064d117dc3b0753dd5bb | |
| parent | ef5aadab9e33e2154789a41bf9dbb8a49b086c21 (diff) | |
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>
| -rw-r--r-- | build/opnfv-apex-common.spec | 10 | ||||
| -rwxr-xr-x | ci/build.sh | 6 |
2 files changed, 12 insertions, 4 deletions
diff --git a/build/opnfv-apex-common.spec b/build/opnfv-apex-common.spec index 6067c7e0..327df3bc 100644 --- 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 dec73760..dd9f9fd1 100755 --- 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 |