fix clean on RO package creation

[osm/RO.git] / devops-stages / stage-build.sh

diff --git a/devops-stages/stage-build.sh b/devops-stages/stage-build.sh
index 28ad87c..a2f565a 100755 (executable)
--- a/devops-stages/stage-build.sh
+++ b/devops-stages/stage-build.sh
@@ -13,29 +13,39 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
+set -ex
+
 rm -rf deb_dist/*
 mkdir -p deb_dist
 
 # main RO module
-make -C RO clean package BRANCH=master
+make -C RO clean package
 cp RO/deb_dist/python3-osm-ro_*.deb deb_dist/
 
 # RO client
 make -C RO-client clean package
 cp RO-client/deb_dist/python3-osm-roclient_*.deb deb_dist/
 
-# VIM plugings:  vmware openstack AWS fos azure Opennebula 
+# RO plugin
+make -C RO-plugin clean package
+cp RO-plugin/deb_dist/python3-osm-ro-plugin_*.deb deb_dist/
+
+# NG-RO
+make -C NG-RO clean package
+cp NG-RO/deb_dist/python3-osm-ng-ro_*.deb deb_dist/
+
+# VIM plugings:  vmware, openstack, AWS, fos, azure, Opennebula,
 for vim_plugin in RO-VIM-*
 do
     make -C $vim_plugin clean package
     cp ${vim_plugin}/deb_dist/python3-osm-rovim*.deb deb_dist/
 done
 
-# SDN plugins
-
-# SDN plugins: Dynpack Tapi Onosof Floodlightof
+# SDN plugins: DynPac, Ietfl2vpn, Onosof Floodlightof
 for sdn_plugin in RO-SDN-*
 do
+    [[ "$sdn_plugin" == RO-SDN-tapi ]] && continue  # tapi folder appears at Jenkins due to container reuse
+    [[ "$sdn_plugin" == RO-SDN-arista ]] && continue  # arista folder appears at Jenkins due to container reuse
     make -C $sdn_plugin clean package
     cp ${sdn_plugin}/deb_dist/python3-osm-rosdn*.deb deb_dist/
 done