Initial changes for move to Ubuntu Jammy LTS

PR URL: https://www.github.com/delphix/appliance-build/pull/715
delphix · Feb 21, 2023 · 40690ad · 40690ad
1 parent 516133f
commit 40690ad
Show file tree

Hide file tree

Showing 9 changed files with 11 additions and 11 deletions.
diff --git a/live-build/auto/config b/live-build/auto/config
@@ -35,7 +35,7 @@ lb config noauto \
 	--bootstrap-flavour minimal \
 	--chroot-filesystem none \
 	--architectures amd64 \
-	--distribution focal \
+	--distribution jammy \
 	--binary-images none \
 	--bootloader none \
 	--system normal \

diff --git a/live-build/config/archives/delphix-secondary-mirror.list.in b/live-build/config/archives/delphix-secondary-mirror.list.in
@@ -14,6 +14,6 @@
 # limitations under the License.
 #
 
-deb @@URL@@ focal main multiverse universe contrib stable
-deb @@URL@@ focal-updates main multiverse universe
-deb @@URL@@ focal-pgdg main
+deb @@URL@@ jammy main multiverse universe contrib stable
+deb @@URL@@ jammy-updates main multiverse universe
+deb @@URL@@ jammy-pgdg main
diff --git a/live-build/config/archives/localhost.list b/live-build/config/archives/localhost.list
@@ -22,4 +22,4 @@
 # used to serve the repository.
 #
 
-deb [trusted=yes] http://localhost:8080 focal main
+deb [trusted=yes] http://localhost:8080 jammy main
diff --git a/scripts/aptly-repo-from-debs.sh b/scripts/aptly-repo-from-debs.sh
@@ -81,6 +81,6 @@ rm -rf "$WORK_DIRECTORY"
 #
 # Generate an Aptly/APT repository
 #
-aptly repo create -distribution=focal -component=delphix upgrade-repository
+aptly repo create -distribution=jammy -component=delphix upgrade-repository
 aptly repo add upgrade-repository debs
 aptly publish repo -skip-contents -skip-signing upgrade-repository
diff --git a/scripts/aptly-repo-from-image-diff.sh b/scripts/aptly-repo-from-image-diff.sh
@@ -93,7 +93,7 @@ popd &>/dev/null || die "'popd' failed"
 # system (e.g. "upgrade-image-from-aptly-repo.sh").
 #
 
-aptly repo create -distribution=focal -component=delphix upgrade-repository ||
+aptly repo create -distribution=jammy -component=delphix upgrade-repository ||
 	die "failed to create repository: 'upgrade-repository'"
 aptly repo search image-a | xargs aptly repo copy image-a upgrade-repository ||
 	die "failed to copy packages to repository: 'upgrade-repository'"

diff --git a/scripts/build-ancillary-repository.sh b/scripts/build-ancillary-repository.sh
@@ -47,7 +47,7 @@ function build_ancillary_repository() {
 
 	rm -rf "$HOME/.aptly"
 	aptly repo create \
-		-distribution=focal -component=main ancillary-repository
+		-distribution=jammy -component=main ancillary-repository
 	aptly repo add ancillary-repository "$pkg_directory"
 	aptly publish repo -skip-contents -skip-signing ancillary-repository
 

diff --git a/scripts/run-live-build.sh b/scripts/run-live-build.sh
@@ -127,7 +127,7 @@ APTLY_SERVE_PID=$!
 set +o errexit
 attempts=0
 while ! curl --output /dev/null --silent --head --fail \
-	"http://localhost:8080/dists/focal/Release"; do
+	"http://localhost:8080/dists/jammy/Release"; do
 	((attempts++))
 	if [[ $attempts -gt 30 ]]; then
 		echo "Timed out waiting for ancillary repository." 1>&2

diff --git a/upgrade/upgrade-scripts/execute b/upgrade/upgrade-scripts/execute
@@ -136,7 +136,7 @@ if [[ -f /etc/apt/sources.list ]]; then
 fi
 
 cat <<EOF >/etc/apt/sources.list ||
-deb [trusted=yes] file://$IMAGE_PATH focal delphix
+deb [trusted=yes] file://$IMAGE_PATH jammy delphix
 EOF
 	die "failed to configure apt sources"
 

diff --git a/upgrade/upgrade-scripts/upgrade-container b/upgrade/upgrade-scripts/upgrade-container
@@ -275,7 +275,7 @@ function create_upgrade_container() {
 		#
 		debootstrap --no-check-gpg --variant=minbase \
 			--components=delphix --include=ntp,systemd-container \
-			focal "$DIRECTORY" "file://$IMAGE_PATH" 1>&2 ||
+			jammy "$DIRECTORY" "file://$IMAGE_PATH" 1>&2 ||
 			die "failed to debootstrap upgrade filesystem"
 
 		#