commit 8845ee5cd0dd2d5b61d5c1ef029c687ad2ba8a01
author Zack Williams <zdw@cs.arizona.edu> Wed Oct 04 23:13:26 2017 -0700
committer Zack Williams <zdw@cs.arizona.edu> Thu Oct 05 12:45:31 2017 -0700
tree f4c9e68cde6e61ec723189d6aa67857469083ca6
parent 2c6ddf3145fb997a611c11e6fd0151fb56ca832a

[CORD-2035]
Fix mavenrepo and onos dependency issues

Change-Id: Ie65d5d61b1e7f1154a7cb936cf1e79bfcb64b9f1

Makefile

diff --git a/Makefile b/Makefile
index 0834fb7..d03c110 100644
--- a/Makefile
+++ b/Makefile
@@ -162,15 +162,16 @@
 
 
 # == PREREQS == #
-VAGRANT_UP_PREREQS     ?=
-COPY_CORD_PREREQS      ?=
-CORD_CONFIG_PREREQS    ?=
-COPY_CONFIG_PREREQS    ?=
-PREP_BUILDNODE_PREREQS ?=
-PREP_HEADNODE_PREREQS  ?=
-DOCKER_IMAGES_PREREQS  ?=
-START_XOS_PREREQS      ?=
-DEPLOY_ONOS_PREREQS    ?=
+VAGRANT_UP_PREREQS       ?=
+COPY_CORD_PREREQS        ?=
+CORD_CONFIG_PREREQS      ?=
+COPY_CONFIG_PREREQS      ?=
+PREP_BUILDNODE_PREREQS   ?=
+PREP_HEADNODE_PREREQS    ?=
+DOCKER_IMAGES_PREREQS    ?=
+START_XOS_PREREQS        ?=
+BUILD_ONOS_APPS_PREREQS  ?=
+DEPLOY_ONOS_PREREQS      ?=
 DEPLOY_OPENSTACK_PREREQS ?=
 DEPLOY_MAVENREPO_PREREQS ?=
 SETUP_AUTOMATION_PREREQS ?=
@@ -259,15 +260,15 @@
 	$(SSH_BUILD) "cd $(BUILD_CORD_DIR)/onos-apps; make MAKE_CONFIG=../build/$(MAKEFILE_CONFIG) build" $(LOGCMD)
 	touch $@
 
-$(M)/publish-onos-apps: | $(M)/deploy-maas $(M)/build-onos-apps
+$(M)/publish-onos-apps: | $(M)/build-onos-apps
 	$(SSH_BUILD) "cd $(BUILD_CORD_DIR)/onos-apps; make MAKE_CONFIG=../build/$(MAKEFILE_CONFIG) publish" $(LOGCMD)
 	touch $@
 
-$(M)/deploy-mavenrepo: | $(M)/publish-onos-apps $(DEPLOY_MAVENREPO_PREREQS)
+$(M)/deploy-mavenrepo: | $(M)/build-onos-apps $(DEPLOY_MAVENREPO_PREREQS)
 	$(ANSIBLE_PB) $(PI)/deploy-mavenrepo-playbook.yml $(LOGCMD)
 	touch $@
 
-$(M)/deploy-onos: | $(M)/docker-images $(DEPLOY_ONOS_PREREQS)
+$(M)/deploy-onos: | $(M)/docker-images $(M)/deploy-mavenrepo $(DEPLOY_ONOS_PREREQS)
 	$(ANSIBLE_PB) $(PI)/deploy-onos-playbook.yml $(LOGCMD)
 	touch $@