Merge branch 'fix_repo_in_packaging_files' into 'master'

should include repos creation See merge request vitam/vitam-griffins!72
ProgrammeVitam · Dec 9, 2019 · 38dac46 · 38dac46
2 parents 3cad15f + b02ed8e
commit 38dac46
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 5 deletions.
diff --git a/packaging/assembly-rpm-signed.xml b/packaging/assembly-rpm-signed.xml
@@ -26,6 +26,7 @@
             <outputDirectory>rpm_signed/</outputDirectory>
             <includes>
                 <include>**/*.rpm</include>
+                <include>**/repodata/*.*</include>
             </includes>
         </fileSet>
     </fileSets>

diff --git a/packaging/assembly.xml b/packaging/assembly.xml
@@ -28,6 +28,7 @@
             <outputDirectory>rpm/</outputDirectory>
             <includes>
                 <include>**/*.rpm</include>
+                <include>**/repodata/*.*</include>
             </includes>
         </fileSet>
         <!-- Add "external" deb -->
@@ -36,6 +37,7 @@
             <outputDirectory>deb/</outputDirectory>
             <includes>
                 <include>**/*.deb</include>
+                 <include>**/Packages.gz</include>
             </includes>
         </fileSet>
     </fileSets>

diff --git a/packaging/pom.xml b/packaging/pom.xml
@@ -65,7 +65,7 @@
 							<arguments>
             					<argument>.</argument>
 							</arguments>
-							<workingDirectory>${TARGET_DIR}/</workingDirectory>
+							<workingDirectory>../rpm/target/</workingDirectory>
 						</configuration>
 					</execution>
 
@@ -92,8 +92,8 @@
             					<argument>-m</argument>
 								<argument>.</argument>
 							</arguments>
-							<workingDirectory>${TARGET_DIR}/</workingDirectory>
-							<outputFile>${TARGET_DIR}/Packages</outputFile>
+							<workingDirectory>../deb/target/</workingDirectory>
+							<outputFile>../deb/target/Packages</outputFile>
 						</configuration>
 					</execution>
 					<execution>
@@ -108,8 +108,8 @@
             					<argument>-9c</argument>
 								<argument>Packages</argument>
 							</arguments>
-							<workingDirectory>${TARGET_DIR}/</workingDirectory>
- 							<outputFile>${TARGET_DIR}/Packages.gz</outputFile>
+							<workingDirectory>../deb/target/</workingDirectory>
+ 							<outputFile>../deb/target/Packages.gz</outputFile>
 						</configuration>
 					</execution>
 					<!-- sign rpm -->