Merge remote-tracking branch 'origin/6.0/release' into 6.0/patch

.github/scripts/install-ansible-lint.sh

@@ -5,7 +5,6 @@ sudo apt-get install ansible
 git clone https://github.com/willthames/ansible-lint /opt/ansible-lint
 cd /opt/ansible-lint
 git checkout v3.4.21
-git branch -D master
 
 #
 # GitHub Actions exposes the GITHUB_ENV file that can be used to

README.md

@@ -104,7 +104,6 @@ the "live-build/build/artifacts/" directory:
     $ ls -lh live-build/build/artifacts/
     total 1.9G
     -rw-r--r-- 1 root root 275M Jan 11 22:31 internal-minimal-kvm.debs.tar.gz
-    -rw-r--r-- 1 root root   45 Jan 11 22:31 internal-minimal-kvm.migration.tar.gz
     -rw-r--r-- 1 root root 636M Jan 11 22:33 internal-minimal-kvm.qcow2
 
 The appliance produced will contain a kernel optimized for the

bootstrap/roles/appliance-build.bootstrap/tasks/main.yml

@@ -25,6 +25,7 @@
       - awscli
       - bc
       - coreutils
+      - devscripts
       - equivs
       - gdisk
       - git

build-info/debian/compat

@@ -0,0 +1 @@
+10

live-build/misc/migration-scripts/dx_prepare → build-info/debian/control

@@ -1,6 +1,5 @@
-#!/bin/bash
 #
-# Copyright 2018 Delphix
+# Copyright 2020 Delphix
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -14,10 +13,13 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 #
+Source: delphix-build-info
+Section: misc
+Priority: optional
+Maintainer: Delphix Engineering <[email protected]>
+Build-Depends: debhelper (>= 10), devscripts
+Standards-Version: 4.1.2
 
-#
-# This script is a no-op and only exist to satisfy dx_unpack.sh
-# from illumos.
-#
-
-exit 0
+Package: delphix-build-info
+Architecture: all
+Description: Provides build metadata for packages built by Delphix.

build-info/debian/copyright

@@ -0,0 +1,18 @@
+Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
+Files: *
+Copyright: 2021 Delphix
+License: Apache-2.0
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+ .
+      http://www.apache.org/licenses/LICENSE-2.0
+ .
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+ .
+ On Debian systems, the complete text of the Apache License, Version 2
+ can be found in "/usr/share/common-licenses/Apache-2.0".

build-info/debian/install

@@ -0,0 +1 @@
+/var/delphix-buildinfo

live-build/misc/ansible-roles/appliance-build.crash-python-development/meta/main.yml → build-info/debian/rules

@@ -1,5 +1,6 @@
+#!/usr/bin/make -f
 #
-# Copyright 2019 Delphix
+# Copyright 2021 Delphix
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -14,6 +15,5 @@
 # limitations under the License.
 #
 
----
-dependencies:
-  - role: appliance-build.minimal-common
+%:
+	dh $@

build-info/debian/source/format

@@ -0,0 +1 @@
+3.0 (native)

build.gradle

@@ -78,13 +78,11 @@ for (variant in allVariants) {
     }
 }
 
-def shellScripts = fileTree("scripts") +
+def shellScripts = fileTree("scripts").include({ details ->
+                         details.file.getName().endsWith(".sh") }) +
                    fileTree("live-build/config/hooks").include({ details ->
                         details.file.canExecute()
                    }) +
-                   fileTree("live-build/misc/migration-scripts", {
-                       exclude "etc_system_whitelist"
-                   }) +
                    fileTree("upgrade", {
                        include "prepare"
                    }) +

live-build/build.gradle

@@ -125,18 +125,10 @@ for (variant in allVariants) {
                         outputs.file "${buildDir}/artifacts/${variant}-${platform}.debs.tar.gz"
                         break
                     case vmArtifactsRunType:
-                        if (variant != "internal-minimal") {
-                            // We don't bother creating a migration image for internal-minimal
-                            outputs.file "${buildDir}/artifacts/${variant}-${platform}.migration.tar.gz"
-                        }
                         outputs.file "${buildDir}/artifacts/${variant}-${platform}.${artifactTypes[platform]}"
                         break
                     case allRunType:
                         outputs.file "${buildDir}/artifacts/${variant}-${platform}.debs.tar.gz"
-                        if (variant != "internal-minimal") {
-                            // We don't bother creating a migration image for internal-minimal
-                            outputs.file "${buildDir}/artifacts/${variant}-${platform}.migration.tar.gz"
-                        }
                         outputs.file "${buildDir}/artifacts/${variant}-${platform}.${artifactTypes[platform]}"
                         break
                 }

live-build/config/hooks/configuration/81-upgrade-repository.binary

@@ -80,6 +80,20 @@ EOF
 #
 rename 's/\%3a/:/g' binary/packages/*.deb
 
+#
+# Copy over the generated hotfix metadata.
+#
+if [[ -z "$AWS_S3_HOTFIX_METADATA" ]]; then
+	touch hotfix_metadata
+else
+	aws s3 cp --only-show-errors "$AWS_S3_HOTFIX_METADATA" hotfix_metadata
+fi
+
+if [[ ! -f "hotfix_metadata" ]]; then
+	echo "Could not generate hotfix_metadata file."
+	exit 1
+fi
+
 #
 # Now we need to create the "delphix-entire" metapackage that will
 # depend on all of the packages that have been installed in the binary

live-build/config/hooks/configuration/template.ctl

@@ -6,7 +6,7 @@ Standards-Version: 3.9.2
 Package: delphix-entire-@@PLATFORM@@
 Provides: delphix-entire
 Version: @@VERSION@@
-Extra-Files: packages.list, variant
+Extra-Files: packages.list, variant, hotfix_metadata
 Description: Entirety of Delphix Appliance
  This package depends on all of the packages that constitute the entirety of
  the Delphix Appliance. This set of packages provide the necessary tools to run

live-build/config/hooks/vm-artifacts/84-clear-apt-cache.binary

@@ -16,8 +16,8 @@
 #
 
 #
-# To reduce the size of our VM and migration images, we clean the APT
-# cache, and remove its "lists" files.
+# To reduce the size of our VM images, we clean the APT cache and remove its
+# "lists" files.
 #
 chroot binary apt-get clean
 chroot binary rm -rf /var/lib/apt/lists/*