adding make option for unit testing

Signed-off-by: r.kuralamudhan <kuralamudhan.ramakrishnan@intel.com>
Change-Id: I54bd376a169fac991b4b288305c752995b99e562

optimizing makefile

Signed-off-by: r.kuralamudhan <kuralamudhan.ramakrishnan@intel.com>
Change-Id: I74e6115aa8b50c51c368fe7700a1a9fe43f03a89

diff --git a/Makefile b/Makefile
index a380bc1..d76198c 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -20,7 +20,8 @@ help:
 install: package_prerequisite \
        kud_bm_deploy_mini \
        bmh_all \
-       bpa_op_bmh_verifier
+       bpa_op_install \
+       bpa_rest_api_install
 
 package_prerequisite:
         pushd $(BMDIR) && ./01_install_package.sh && popd
@@ -105,13 +106,21 @@ bpa_rest_api_verifier:
 bpa_rest_api_unit:
        pushd $(BPA_REST_API) && make unit_test && popd
 
+unit: prerequisite \
+       bashate \
+       bpa_op_unit \
+       bpa_rest_api_unit
+
 bashate:
        bashate -i E006,E003,E002,E010,E011,E042,E043 `find . -type f -not -path './cmd/bpa-operator/vendor/*' -not -path './ci/jjb/shell/*' -name *.sh`
 
 prerequisite:
        pushd $(ENV) && ./cd_package_installer.sh && popd
 
-bm_verifer: install
+bm_verifer: package_prerequisite \
+        kud_bm_deploy_mini \
+        bmh_all \
+       bpa_op_bmh_verifier
 
 verify_all: prerequisite \
        metal3_prerequisite \

diff --git a/cmd/bpa-restapi-agent/e2e_test.sh b/cmd/bpa-restapi-agent/e2e_test.sh
index bfc9478..d27c78f 100755 (executable)
--- a/cmd/bpa-restapi-agent/e2e_test.sh
+++ b/cmd/bpa-restapi-agent/e2e_test.sh
@@ -45,6 +45,7 @@ while [[ $cur_status != "Running" ]]; do
     if [[ $cur_status != "Running" ]]; then
         echo "$(date +%H:%M:%S) - BPA-RESTful-API Pod status: $cur_status"
     else
+        echo "$(date +%H:%M:%S) - BPA-RESTful-API Pod status: $cur_status"
         break
 
     fi

diff --git a/env/ubuntu/bootloader-env/02_clean_bootloader_package_req.sh b/env/ubuntu/bootloader-env/02_clean_bootloader_package_req.sh
index 539d540..6be9802 100755 (executable)
--- a/env/ubuntu/bootloader-env/02_clean_bootloader_package_req.sh
+++ b/env/ubuntu/bootloader-env/02_clean_bootloader_package_req.sh
@@ -14,6 +14,11 @@ if [[ $(lsb_release -d | cut -f2) != $UBUNTU_BIONIC ]]; then
     exit 1
 fi
 
+function autoremove {
+    apt-get autoremove -y
+    rm -rf /etc/apt/sources.list.d/*
+}
+
 function clean_essential_packages {
     apt-get update
     for package in crudini curl dnsmasq figlet golang nmap patch psmisc \
@@ -21,8 +26,7 @@ function clean_essential_packages {
         apt-get remove $package -y
     done
 
-    apt-get autoremove -y
-    rm -rf /etc/apt/sources.list.d/*
+    autoremove
 }
 
 function check_prerequisite {
@@ -40,9 +44,9 @@ function check_prerequisite {
 }
 
 function clean_ironic_packages {
-    for package in jq nodejs python-ironicclient \
-        python-ironic-inspector-client python-lxml python-netaddr \
-        python-openstackclient unzip genisoimage; do
+    for package in python-ironicclient \
+        python-ironic-inspector-client \
+        python-openstackclient genisoimage; do
         apt-get remove $package -y
     done
 }
@@ -127,7 +131,7 @@ if [ "$1" == "--only-packages" ]; then
     check_prerequisite
     clean_docker_packages
     clean_ironic_packages
-    clean_essential_packages
+    autoremove
     exit 0
 fi
 

diff --git a/user_config.sh b/user_config.sh
index f0ed1f7..42689fc 100644 (file)
--- a/user_config.sh
+++ b/user_config.sh
@@ -1,15 +1,15 @@
 #!/bin/bash
 
 #Local controller - Bootstrap cluster DHCP connection
-export BS_DHCP_INTERFACE="ens513f0"
+export BS_DHCP_INTERFACE="eno3"
 export BS_DHCP_INTERFACE_IP="172.31.1.1/24"
 
 #Ironic Metal3 settings for provisioning network
-export IRONIC_INTERFACE="enp4s0f1"
+export IRONIC_INTERFACE="enp4s0f3"
 
 #Ironic Metal3 setting for IPMI LAN Network
-export IRONIC_IPMI_INTERFACE="enp4s0f0"
-export IRONIC_IPMI_INTERFACE_IP="10.10.110.20"
+export IRONIC_IPMI_INTERFACE="eno1"
+export IRONIC_IPMI_INTERFACE_IP="10.10.110.25"
 
 #User Network configuration
 export PROVIDER_NETWORK_GATEWAY="10.10.110.1"