Merge "Change default package format to dar." into R5.0

Juniper · Jun 5, 2018 · 16f340c · 16f340c
2 parents 3ea9ccc + 0c5dc11
commit 16f340c
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 8 deletions.
diff --git a/Makefile b/Makefile
@@ -5,11 +5,11 @@
 SB_ROOT = ..
 JAVA_API_DIR = $(SB_ROOT)/java-api
 
-OUTPUT_FILE = o11nplugin-contrail.vmoapp
+OUTPUT_FILE = o11nplugin-contrail.dar
 
 MVN = mvn -Drepo.host=$(REPO_HOST)
 
-.PHONY: repo init sync vmoapp build test clean
+.PHONY: repo init sync package build test clean
 .ONESHELL:
 
 $(SB_ROOT)/repo:
@@ -34,11 +34,11 @@ java-api-install:
 dist/$(OUTPUT_FILE): java-api-install
 	$(MVN) install
 
-vmoapp: dist/$(OUTPUT_FILE)
+package: dist/$(OUTPUT_FILE)
 
-build: vmoapp
+build: package
 
-test: build
+test: package
 
 clean:
 	$(MVN) clean
diff --git a/o11nplugin-contrail/pom.xml b/o11nplugin-contrail/pom.xml
@@ -109,7 +109,7 @@
         <artifactId>maven-resources-plugin</artifactId>
         <executions>
           <execution>
-            <id>copy-vmoapp-file</id>
+            <id>copy-output-files</id>
             <phase>install</phase>
             <goals>
               <goal>copy-resources</goal>
@@ -121,6 +121,7 @@
                   <directory>${basedir}/target/</directory>
                   <includes>
                     <include>${project.build.finalName}.vmoapp</include>
+                    <include>${project.build.finalName}.dar</include>
                   </includes>
                 </resource>
               </resources>

diff --git a/playbooks/contrail-build-vro-plugin/run.yaml b/playbooks/contrail-build-vro-plugin/run.yaml
@@ -17,7 +17,7 @@
       command: make REPO_HOST=sdnpoc-vrodev.englab.juniper.net build
       args:
         chdir: "{{ ansible_env.HOME }}/{{ packaging.target_dir }}/vro-plugin"
-        creates: "{{ ansible_env.HOME }}/{{ packaging.target_dir }}/vro-plugin/dist/o11nplugin-contrail.vmoapp"
+        creates: "{{ ansible_env.HOME }}/{{ packaging.target_dir }}/vro-plugin/dist/o11nplugin-contrail.dar"
 
     - name: Create artifacts dir
       file:
@@ -26,6 +26,6 @@
 
     - name: Copy vro plugin to exported artifacts dir
       copy:
-        src: "{{ ansible_env.HOME }}/{{ packaging.target_dir }}/vro-plugin/dist/o11nplugin-contrail.vmoapp"
+        src: "{{ ansible_env.HOME }}/{{ packaging.target_dir }}/vro-plugin/dist/o11nplugin-contrail.dar"
         dest: "{{ ansible_env.HOME }}/artifacts/"
         remote_src: true