fixing ordering
Change-Id: Ia6388be35ab1a4763e2717771175b647fa400930
diff --git a/build.gradle.new b/build.gradle.new
index fa2f2e6..2dfc4b9 100644
--- a/build.gradle.new
+++ b/build.gradle.new
@@ -117,12 +117,10 @@
}
tasks.addRule(new DockerFetchRule(project))
-tasks.addRule(new DockerPublishRule(project))
+tasks.addRule(new DockerPublishRule(project, project(':maas').prime))
tasks.addRule(new DockerTagRule(project))
-tasks.addRule(new GitSubmoduleUpdateRule(project))
project('platform-install').deployPlatform.dependsOn project(':maas').deployBase
-publishImages.mustRunAfter project(':maas').prime
task deploy {
dependsOn << project(':platform-install').deployPlatform
diff --git a/buildSrc/src/main/groovy/org/opencord/gradle/rules/DockerPublishRule.groovy b/buildSrc/src/main/groovy/org/opencord/gradle/rules/DockerPublishRule.groovy
index a1d8164..39b6bba 100644
--- a/buildSrc/src/main/groovy/org/opencord/gradle/rules/DockerPublishRule.groovy
+++ b/buildSrc/src/main/groovy/org/opencord/gradle/rules/DockerPublishRule.groovy
@@ -26,11 +26,17 @@
class DockerPublishRule implements Rule {
def project
+ def dependency
DockerPublishRule(project) {
this.project = project
}
+ DockerPublishRule(project, dependency) {
+ this.project = project
+ this.dependency = dependency
+ }
+
String getDescription() {
'Rule Usage: publish<component-name>'
}
@@ -42,6 +48,9 @@
println "Publish rule: $taskName + $compName"
def tagTask = "tag$compName"
println "Tagtask: $tagTask"
+ if (dependency) {
+ dependsOn dependency
+ }
dependsOn tagTask
def spec = project.comps[ext.compName]
repositoryName = spec.name + ':' + project.targetTag
diff --git a/config/onlab_develop_pod.yml b/config/onlab_develop_pod.yml
index 570ef6a..ec7b940 100644
--- a/config/onlab_develop_pod.yml
+++ b/config/onlab_develop_pod.yml
@@ -23,9 +23,8 @@
fabric_ip: '10.6.1.1/24'
management_ip: '10.6.0.1/24'
external_ip: '10.90.0.2/24'
- external_iface: 'em1'
+ external_iface: 'eth0'
skipTags:
- - 'interface_config'
docker:
imageVersion: candidate