Skip to content

Commit

Permalink
Story #11929: Signing DEB & RPM packages & Reorganize package delivery (
Browse files Browse the repository at this point in the history
  • Loading branch information
Saadounn authored Dec 13, 2023
1 parent 1c35b25 commit eca7633
Show file tree
Hide file tree
Showing 7 changed files with 284 additions and 163 deletions.
52 changes: 52 additions & 0 deletions packaging/GPG-KEY-vitam
Original file line number Diff line number Diff line change
@@ -0,0 +1,52 @@
-----BEGIN PGP PUBLIC KEY BLOCK-----

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
6GhoH79PavzcZnXPc5ZIlhkGxv0Ax4QpPWiX
=kcKT
-----END PGP PUBLIC KEY BLOCK-----
47 changes: 47 additions & 0 deletions packaging/assembly-deb.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,47 @@
<?xml version="1.0" encoding="UTF-8"?>
<assembly xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.2" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.2 http://maven.apache.org/xsd/assembly-1.1.2.xsd">
<id>DEB</id>
<formats>
<format>tar.gz</format>
</formats>
<includeBaseDirectory>false</includeBaseDirectory>
<fileSets>

<!-- Add the public GPG key -->
<fileSet>
<directory>.</directory>
<outputDirectory>/</outputDirectory>
<includes>
<include>GPG-KEY-vitam</include>
</includes>
</fileSet>

<fileSet>
<directory>packages/deb/</directory>
<outputDirectory>/deb</outputDirectory>
<includes>
<include>Packages</include>
<include>Packages.gz</include>
<include>Release</include>
<include>InRelease</include>
</includes>
</fileSet>

<fileSet>
<directory>packages/deb/cots/</directory>
<outputDirectory>/deb/cots</outputDirectory>
<includes>
<include>*.deb</include>
</includes>
</fileSet>

<fileSet>
<directory>packages/deb/vitamui/</directory>
<outputDirectory>/deb/vitamui</outputDirectory>
<includes>
<include>*.deb</include>
</includes>
</fileSet>

</fileSets>
</assembly>
23 changes: 3 additions & 20 deletions packaging/assembly-deployment.xml
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<assembly xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.2" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.2 http://maven.apache.org/xsd/assembly-1.1.2.xsd">
<id>deployment</id>
<id>DEPLOYMENT</id>
<formats>
<format>zip</format>
<format>tar.gz</format>
</formats>
<includeBaseDirectory>false</includeBaseDirectory>
<fileSets>
Expand All @@ -11,27 +11,10 @@
<directory>../deployment</directory>
<outputDirectory>deployment</outputDirectory>
<excludes>
<exclude>target/</exclude>
<exclude>target/**</exclude>
<exclude>**/*.retry</exclude>
<exclude>**/*.settings/**</exclude>
<exclude>**/*.project</exclude>
<exclude>**/*.gitignore</exclude>
<exclude>vault_pass.txt</exclude>
<exclude>vault_pki.pass</exclude>
<exclude>environments/hosts.local</exclude>
<exclude>environments/hosts.vitam</exclude>
<exclude>environments/hosts.vitamui</exclude>
<exclude>environments/hosts.example</exclude>
<!-- We exclude information about CA/certs/keystores and vault linked to them.
They must be generated during a deployment or loaded - and stored oustide sources. -->
<exclude>environments/group_vars/all/vault-keystores.yml.example</exclude>
<exclude>environments/group_vars/all/vault-keystores.yml</exclude>
<exclude>environments/certs/vault-certs.yml.example</exclude>
<exclude>environments/certs/vault-certs.yml</exclude>
<exclude>environments/certs/vault-ca.yml.example</exclude>
<exclude>environments/certs/vault-ca.yml</exclude>
<exclude>pki/ca/**</exclude>
<exclude>pki/config/*/*</exclude>
<exclude>pki/tempcerts/**</exclude>
<exclude>environments/certs/**</exclude>
<exclude>environments/certs_vitam/**</exclude>
Expand Down
130 changes: 130 additions & 0 deletions packaging/assembly-full.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,130 @@
<?xml version="1.0" encoding="UTF-8"?>
<assembly xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.2" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.2 http://maven.apache.org/xsd/assembly-1.1.2.xsd">
<id>FULL</id>
<formats>
<format>tar.gz</format>
</formats>
<includeBaseDirectory>false</includeBaseDirectory>
<fileSets>


<!-- Add the public GPG key -->
<fileSet>
<directory>.</directory>
<outputDirectory>/</outputDirectory>
<includes>
<include>GPG-KEY-vitam</include>
</includes>
</fileSet>


<!-- RPM PACKAGES -->
<fileSet>
<directory>packages/rpm/repodata</directory>
<outputDirectory>/rpm/repodata</outputDirectory>
<includes>
<include>**/*</include>
</includes>
</fileSet>

<fileSet>
<directory>packages/rpm/cots/</directory>
<outputDirectory>/rpm/cots</outputDirectory>
<includes>
<include>*.rpm</include>
</includes>
</fileSet>

<fileSet>
<directory>packages/rpm/vitamui/</directory>
<outputDirectory>/rpm/vitamui</outputDirectory>
<includes>
<include>*.rpm</include>
</includes>
</fileSet>


<!-- DEB PACKAGES -->
<fileSet>
<directory>packages/deb/</directory>
<outputDirectory>/deb</outputDirectory>
<includes>
<include>Packages</include>
<include>Packages.gz</include>
<include>Release</include>
<include>InRelease</include>
</includes>
</fileSet>

<fileSet>
<directory>packages/deb/cots/</directory>
<outputDirectory>/deb/cots</outputDirectory>
<includes>
<include>*.deb</include>
</includes>
</fileSet>

<fileSet>
<directory>packages/deb/vitamui/</directory>
<outputDirectory>/deb/vitamui</outputDirectory>
<includes>
<include>*.deb</include>
</includes>
</fileSet>


<!-- Sources -->
<fileSet>
<directory>..</directory>
<outputDirectory>sources</outputDirectory>
<excludes>
<!-- IntelliJ project files -->
<exclude>**/*.iml</exclude>
<exclude>**/.idea/**</exclude>
<!-- Various build files & folders -->
<exclude>**/build/**</exclude>
<exclude>**/_build/**</exclude>
<exclude>**/target/**</exclude>
<exclude>**/*.class</exclude>
<exclude>**/*.log</exclude>
<!-- RPM build files -->
<exclude>**/RPMS/**</exclude>
<exclude>**/SRPMS/**</exclude>
<exclude>**/BUILD/**</exclude>
<exclude>**/BUILDROOT/**</exclude>
<!-- Eclipse project files -->
<exclude>**/.classpath</exclude>
<exclude>**/.project</exclude>
<exclude>**/.settings/**</exclude>
<!-- Ansible temp files -->
<exclude>**/*.retry</exclude>
<!-- Git-related -->
<exclude>**/.git/**</exclude>
<!-- Other -->
<exclude>**/node_modules/**</exclude>
<exclude>**/evosuite-tests/**</exclude>
<exclude>**/rpm_signed/**</exclude>
<exclude>**/*@tmp/**</exclude>
</excludes>
</fileSet>


<!-- Ansible deployment files -->
<fileSet>
<directory>../deployment</directory>
<outputDirectory>deployment</outputDirectory>
<excludes>
<exclude>target/**</exclude>
<exclude>**/*.retry</exclude>
<exclude>**/*.settings/**</exclude>
<exclude>**/*.project</exclude>
<exclude>pki/tempcerts/**</exclude>
<exclude>environments/certs/**</exclude>
<exclude>environments/certs_vitam/**</exclude>
<exclude>environments/keystores/**</exclude>
</excludes>
</fileSet>
</fileSets>


</assembly>
44 changes: 44 additions & 0 deletions packaging/assembly-rpm.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,44 @@
<?xml version="1.0" encoding="UTF-8"?>
<assembly xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.2" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.2 http://maven.apache.org/xsd/assembly-1.1.2.xsd">
<id>RPM</id>
<formats>
<format>tar.gz</format>
</formats>
<includeBaseDirectory>false</includeBaseDirectory>
<fileSets>

<!-- Add the public GPG key -->
<fileSet>
<directory>.</directory>
<outputDirectory>/</outputDirectory>
<includes>
<include>GPG-KEY-vitam</include>
</includes>
</fileSet>

<fileSet>
<directory>packages/rpm/repodata</directory>
<outputDirectory>/rpm/repodata</outputDirectory>
<includes>
<include>**/*</include>
</includes>
</fileSet>

<fileSet>
<directory>packages/rpm/cots/</directory>
<outputDirectory>/rpm/cots</outputDirectory>
<includes>
<include>*.rpm</include>
</includes>
</fileSet>

<fileSet>
<directory>packages/rpm/vitamui/</directory>
<outputDirectory>/rpm/vitamui</outputDirectory>
<includes>
<include>*.rpm</include>
</includes>
</fileSet>

</fileSets>
</assembly>
46 changes: 0 additions & 46 deletions packaging/assembly.xml

This file was deleted.

Loading

0 comments on commit eca7633

Please sign in to comment.