Changes for 'make -j4' to work
Change-Id: I180ba628197994b97cf24e53a9b67653b5791b73
diff --git a/Makefile b/Makefile
index 880c11f..9a0035c 100644
--- a/Makefile
+++ b/Makefile
@@ -229,7 +229,7 @@
$(SSH_BUILD) "cd $(BUILD_CORD_DIR)/onos-apps; make MAKE_CONFIG=../build/$(MAKEFILE_CONFIG) build" $(LOGCMD)
touch $@
-$(M)/publish-onos-apps: | $(M)/maas-prime $(M)/build-onos-apps
+$(M)/publish-onos-apps: | $(M)/deploy-maas $(M)/build-onos-apps
$(SSH_BUILD) "cd $(BUILD_CORD_DIR)/onos-apps; make MAKE_CONFIG=../build/$(MAKEFILE_CONFIG) publish" $(LOGCMD)
touch $@
@@ -252,7 +252,7 @@
touch $@
# Requires ib_actions.yml file which is on the build host
-$(M)/publish-docker-images: | $(M)/maas-prime $(M)/docker-images $(M)/core-image
+$(M)/publish-docker-images: | $(M)/deploy-maas $(M)/docker-images $(M)/core-image
$(SSH_BUILD) "cd $(BUILD_CORD_DIR)/build; $(ANSIBLE_PB_LOCAL) $(PI)/publish-images-playbook.yml" $(LOGCMD)
touch $@
diff --git a/scenarios/cord/config.yml b/scenarios/cord/config.yml
index 75e2b53..6a8b0a2 100644
--- a/scenarios/cord/config.yml
+++ b/scenarios/cord/config.yml
@@ -63,10 +63,6 @@
# make build config
build_targets:
- - prereqs-check
- - prep-buildnode
- - prep-headnode
- - setup-automation
- compute1-up
vagrant_up_prereqs:
@@ -78,18 +74,10 @@
copy_config_prereqs:
- cord-config
-prep_buildnode_prereqs:
- - copy-cord
- - copy-config
-
prep_headnode_prereqs:
- copy-cord
- copy-config
-# Wait until headnode prepped before building containers, for consistent DNS
-docker_images_prereqs:
- - prep-headnode
-
# Start elasticstack before XOS/ONOS, which log to it
start_xos_prereqs:
- deploy-elasticstack
@@ -102,6 +90,7 @@
deploy_onos_prereqs:
- deploy-maas
- deploy-mavenrepo
+ - publish-docker-images
deploy_mavenrepo_prereqs:
- deploy-maas