TOOLS-3559 Add the Augmented to all release artifacts (tarballs, debs, etc.) (#674)

This also significantly changes the release code so that the files generated by the `dist` task following the naming scheme of the file we would/will release. For non-tag builds, these files will include the git commit in their name. When we do a release, the files that we release and make available for download should only include the tag.

Author: autarch

.gitignore

@@ -15,6 +15,7 @@
 *.zip
 
 /deb_build
+/rpm_build
 /purls.txt
 /silkbomb.env
 /release.*

common.yml

@@ -243,9 +243,11 @@ functions:
         aws_key: ${aws_key}
         aws_secret: ${aws_secret}
         local_files_include_filter:
-          - src/github.com/mongodb/mongo-tools/release.*
-          - src/github.com/mongodb/mongo-tools/*.deb
-          - src/github.com/mongodb/mongo-tools/*.rpm
+          - src/github.com/mongodb/mongo-tools/mongodb-database-tools*.deb
+          - src/github.com/mongodb/mongo-tools/mongodb-database-tools*.msi
+          - src/github.com/mongodb/mongo-tools/mongodb-database-tools*.rpm
+          - src/github.com/mongodb/mongo-tools/mongodb-database-tools*.tgz
+          - src/github.com/mongodb/mongo-tools/mongodb-database-tools*.zip
         remote_file: mongo-tools/pkgs/${build_id}/
         content_type: application/octet-stream
         bucket: mciuploads
@@ -259,9 +261,11 @@ functions:
         target: src/github.com/mongodb/mongo-tools/upload.tgz
         source_dir: src/github.com/mongodb/mongo-tools
         include:
-          - "./release.*"
-          - "*.deb"
-          - "*.rpm"
+          - mongodb-database-tools*.deb
+          - mongodb-database-tools*.msi
+          - mongodb-database-tools*.rpm
+          - mongodb-database-tools*.tgz
+          - mongodb-database-tools*.zip
     - command: s3.put
       params:
         aws_key: ${aws_key}
@@ -311,9 +315,11 @@ functions:
         aws_key: ${aws_key}
         aws_secret: ${aws_secret}
         local_files_include_filter:
-          - src/github.com/mongodb/mongo-tools/release.*
-          - src/github.com/mongodb/mongo-tools/*.deb
-          - src/github.com/mongodb/mongo-tools/*.rpm
+          - src/github.com/mongodb/mongo-tools/mongodb-database-tools*.deb
+          - src/github.com/mongodb/mongo-tools/mongodb-database-tools*.msi
+          - src/github.com/mongodb/mongo-tools/mongodb-database-tools*.rpm
+          - src/github.com/mongodb/mongo-tools/mongodb-database-tools*.tgz
+          - src/github.com/mongodb/mongo-tools/mongodb-database-tools*.zip
         remote_file: mongo-tools/task/sign/${build_id}/
         bucket: mciuploads
         permissions: public-read
@@ -706,14 +712,6 @@ tasks:
         params:
           file: src/github.com/mongodb/mongo-tools/expansions.yml
       - func: "fetch dist release artifacts"
-      - command: shell.exec
-        params:
-          working_dir: src/github.com/mongodb/mongo-tools
-          script: |
-            ${_set_shell_env}
-            ${_maybe_enable_devtoolset_7}
-            PATH=$PATH:$HOME
-            go run release/release.go rename-release-files-for-papertrail
       - command: papertrail.trace
         params:
           key_id: ${papertrail_key_id}
@@ -1905,8 +1903,7 @@ buildvariants:
       - name: "sign"
         run_on: macos-1014-codesign
       - name: "push"
-        run_on: rhel70-small
-        git_tag_only: true
+        run_on: rhel80-small
 
   #######################################
   #       macOS ARM Buildvariant        #
@@ -1923,8 +1920,7 @@ buildvariants:
       - name: "sign"
         run_on: macos-1014-codesign
       - name: "push"
-        run_on: rhel70-small
-        git_tag_only: true
+        run_on: rhel80-small
 
   #######################################
   #     RHEL x86_64 Buildvariants       #

installer/msi/LicensingFragment.wxs

@@ -21,12 +21,19 @@
               Source="$(var.SourceDir)\README.md"
               DiskId ="1"/>
       </Component>
+      <Component Id="c_AugmentedSBOM" Guid="88fbc184-900f-4074-9fbf-5b5bfd2da5a7">
+        <File Id="f_AugmentedSBOM"
+              Name="$(var.AugmentedSBOMFilename)"
+              Source="$(var.SourceDir)\$(var.AugmentedSBOMFilename)"
+              DiskId ="1"/>
+      </Component>
     </DirectoryRef>
 
     <ComponentGroup Id="cg_License">
       <ComponentRef Id="c_Thirdparty"/>
       <ComponentRef Id="c_Readme"/>
       <ComponentRef Id="c_License"/>
+      <ComponentRef Id="c_AugmentedSBOM"/>
     </ComponentGroup>
 
     <WixVariable Id="WixUILicenseRtf" Value="$(var.ResourceDir)\LICENSE.rtf" />

installer/rpm/mongodb-database-tools.spec

@@ -58,6 +58,7 @@ rm -rf %{buildroot}
 %attr(0644,root,root) /usr/share/doc/mongodb-database-tools/LICENSE.md
 %attr(0644,root,root) /usr/share/doc/mongodb-database-tools/README.md
 %attr(0644,root,root) /usr/share/doc/mongodb-database-tools/THIRD-PARTY-NOTICES
+%attr(0644,root,root) /usr/share/doc/mongodb-database-tools/@TOOLS_BOM_FILE@
 
 %pre
 # On install