Skip to content

Commit 3749b07

Browse files
sorenisanerdsorenisanerd
committed
Assorted installer and test fixes
1 parent c586260 commit 3749b07

File tree

24 files changed

+183
-86
lines changed

24 files changed

+183
-86
lines changed

‎.github/workflows/build.yml‎

Lines changed: 40 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -5,11 +5,6 @@ on:
55

66
jobs:
77
build:
8-
strategy:
9-
matrix:
10-
profiles:
11-
- verity-full,docker-ext
12-
- verity-full,docker
138
runs-on: ubuntu-latest
149
permissions:
1510
contents: write
@@ -78,20 +73,35 @@ jobs:
7873
cat <<EOF > mkosi.key
7974
$MANGOS_KEY
8075
EOF
76+
- name: Inject GnuPG key
77+
env:
78+
MANGOS_GNUPG_KEY: ${{ secrets.MANGOS_GNUPG_KEY }}
79+
run: |
80+
set -e
81+
if [ -z "${MANGOS_GNUPG_KEY}" ]; then
82+
echo '::warning title=Missing key::`MANGOS_GNUPG_KEY` was not set. Generating temporary key.'
83+
echo '`MANGOS_GNUPG_KEY` was not set. Build performed with ephemeral key.' >> ${GITHUB_STEP_SUMMARY}
84+
GNUPGHOME=$(pwd)/.gnupg gpg --batch --passphrase '' --quick-generate-key "ephemeral github.com/${GITHUB_REPOSITORY} signing Key"
85+
exit 0
86+
fi
87+
GNUPGHOME=$(pwd)/.gnupg gpg --batch --import <<EOF
88+
$MANGOS_GNUPG_KEY
89+
EOF
8190
- name: Download Hashistack
8291
run: |
8392
./hashiext-download.sh
8493
- name: Run mkosi
8594
env:
86-
profiles: ${{ matrix.profiles }}
8795
MANGOS_GITHUB_URL: ${{ github.server_url }}/${{ github.repository }}
8896
run: |
89-
mkosi -E RUNNER_ENVIRONMENT --debug --profile= --profile="${profiles},hashistack"
90-
mkosi -E RUNNER_ENVIRONMENT --debug --profile= --profile="${profiles},installer"
97+
mkosi -E RUNNER_ENVIRONMENT --debug
98+
rm *.zip mkosi.images/*/bin/*
9199
- name: List built artifacts
92-
run: find out/
100+
run: ls out/
93101
- name: Export image version for later steps
94102
run: echo IMAGE_VERSION="$(./mkosi.version)" >> $GITHUB_ENV
103+
- name: Free Disk Space (Ubuntu)
104+
uses: jlumbroso/free-disk-space@main
95105
- name: Test it
96106
run: |
97107
#!/bin/bash
@@ -110,7 +120,7 @@ jobs:
110120
shopt -s nullglob
111121
for file in out/mangos{,-installer}_${IMAGE_VERSION}.{raw,efi} out/docker*_${IMAGE_VERSION}.raw
112122
do
113-
zstd --rm "$file"
123+
test -f "${file}" && zstd --rm "$file"
114124
done
115125
# - name: Sign artifacts
116126
# run: for file in out/mangos* ; do cosign sign-blob -d -y --bundle "${file}.sigbundle" "${file}" > /dev/null; done
@@ -136,31 +146,27 @@ jobs:
136146
out/mangos-installer_${{ env.IMAGE_VERSION }}.github.json
137147
out/mangos-installer_${{ env.IMAGE_VERSION }}.spdx.json
138148
out/mangos-installer_${{ env.IMAGE_VERSION }}.syft.json
139-
name: mangos.${{ matrix.profiles }}
140-
141-
release:
142-
if: github.ref_type == 'tag'
143-
runs-on: ubuntu-latest
144-
needs:
145-
- build
146-
permissions:
147-
contents: write
148-
steps:
149-
- name: Download artifacts
150-
uses: actions/download-artifact@v4
151-
with:
152-
path: artifacts
153-
- name: Rename artifacts
154-
run: |
155-
mkdir release
156-
157-
mv artifacts/mangos.verity-full,docker-ext/* release/
158-
for f in artifacts/mangos.verity-full,docker/* ; do
159-
[ "$(basename $f)" == "mangosctl" ] && continue
160-
mv "$f" "release/mangos+docker_$(basename $f | cut -f2- -d_)"
161-
done
162149
- name: Release
150+
if: github.ref_type == 'tag'
163151
uses: softprops/action-gh-release@v2
164152
with:
165153
draft: true
166-
files: release/*
154+
files: |
155+
out/mangos_${{ env.IMAGE_VERSION }}.efi.zst
156+
out/mangos_${{ env.IMAGE_VERSION }}.root-x86-64.*.zst
157+
out/mangos_${{ env.IMAGE_VERSION }}.root-x86-64-verity.*.zst
158+
out/mangos_${{ env.IMAGE_VERSION }}.root-x86-64-verity-sig.*.zst
159+
out/mangos_${{ env.IMAGE_VERSION }}.raw.zst
160+
out/mangos_${{ env.IMAGE_VERSION }}.cyclonedx.json
161+
out/mangos_${{ env.IMAGE_VERSION }}.github.json
162+
out/mangos_${{ env.IMAGE_VERSION }}.spdx.json
163+
out/mangos_${{ env.IMAGE_VERSION }}.syft.json
164+
out/mangos_${{ env.IMAGE_VERSION }}.manifest
165+
out/mangosctl
166+
out/docker*_${{ env.IMAGE_VERSION }}.raw.zst
167+
out/mangos-installer_${{ env.IMAGE_VERSION }}.raw.zst
168+
out/mangos-installer_${{ env.IMAGE_VERSION }}.cyclonedx.json
169+
out/mangos-installer_${{ env.IMAGE_VERSION }}.github.json
170+
out/mangos-installer_${{ env.IMAGE_VERSION }}.spdx.json
171+
out/mangos-installer_${{ env.IMAGE_VERSION }}.syft.json
172+

‎.github/workflows/pr.yml‎

Lines changed: 4 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -5,11 +5,6 @@ on:
55

66
jobs:
77
build:
8-
strategy:
9-
matrix:
10-
profiles:
11-
- verity-full,docker-ext
12-
- verity-full,docker
138
runs-on: ubuntu-latest
149
steps:
1510
- name: Install cosign
@@ -56,20 +51,19 @@ jobs:
5651
dl/mangos.packages_*.tar.zst
5752
- name: Decompress and stage packages
5853
run: mkdir mkosi.packages ; tar -x --zstd -f dl/mangos.packages_*.tar.zst -C mkosi.packages
59-
- name: Generate key
54+
- name: Generate keys
6055
run: |
6156
#!/bin/sh
6257
mkosi genkey
58+
GNUPGHOME=$(pwd)/.gnupg gpg --batch --passphrase '' --quick-generate-key "test key"
6359
- name: Download Hashistack
6460
run: |
6561
./hashiext-download.sh
6662
- name: Run mkosi
6763
env:
68-
profiles: ${{ matrix.profiles }}
6964
MANGOS_GITHUB_URL: ${{ github.server_url }}/${{ github.repository }}
7065
run: |
71-
mkosi -E RUNNER_ENVIRONMENT --debug --profile= --profile="${profiles},hashistack"
72-
mkosi -E RUNNER_ENVIRONMENT --debug --profile= --profile="${profiles},installer"
66+
mkosi -E RUNNER_ENVIRONMENT --debug --profile= --profile=verity-full,docker-ext,hashistack
7367
- name: List built artifacts
7468
run: find out/
7569
- name: Export image version for later steps
@@ -92,7 +86,7 @@ jobs:
9286
shopt -s nullglob
9387
for file in out/mangos{,-installer}_${IMAGE_VERSION}.{raw,efi} out/docker*_${IMAGE_VERSION}.raw
9488
do
95-
zstd --rm "$file"
89+
test -f "${file}" && zstd --rm "$file"
9690
done
9791
# - name: Sign artifacts
9892
# run: for file in out/mangos* ; do cosign sign-blob -d -y --bundle "${file}.sigbundle" "${file}" > /dev/null; done
@@ -118,4 +112,3 @@ jobs:
118112
out/mangos-installer_${{ env.IMAGE_VERSION }}.github.json
119113
out/mangos-installer_${{ env.IMAGE_VERSION }}.spdx.json
120114
out/mangos-installer_${{ env.IMAGE_VERSION }}.syft.json
121-
name: mangos.${{ matrix.profiles }}

‎.gitignore‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,8 @@
99
/mkosi.packages
1010
/gpg
1111
/*.acast
12+
/.gnupg
13+
/dist
1214
/resources/cni/**
1315
mkosi.local
1416
mkosi.local.conf

‎hashiext-download.sh‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ download() {
2727

2828
local url="https://releases.hashicorp.com/${name}/${version}/${name}_${version}_linux_amd64.zip"
2929
local fname="${url##*/}"
30-
wget -O "${fname}" "${url}"
30+
wget --progress=dot:giga -O "${fname}" "${url}"
3131

3232
sha256sums=https://releases.hashicorp.com/${name}/${version}/${name}_${version}_SHA256SUMS
3333
sha256sums_sig=https://releases.hashicorp.com/${name}/${version}/${name}_${version}_SHA256SUMS.sig

‎mkosi.conf‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ Incremental=yes
3131
Environment=MANGOS_GITHUB_URL
3232

3333
[Config]
34-
Profiles=verity-full,secureboot
34+
Profiles=verity-full,docker-ext,hashistack,secureboot
3535
Dependencies=initrd,base
3636

3737
[Include]

‎mkosi.images/base/mkosi.extra/usr/share/mangos/test.nomad‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,9 @@ job "test" {
3434
#!/bin/bash
3535
3636
set -e
37+
cat /etc/resolv.conf || true
3738
39+
export CONSUL_HTTP_ADDR=http://127.0.0.1:8500
3840
consul acl token read -self -format json > consul.json
3941
4042
jq -e '[(.Roles | length)==1, .Roles[0].Name=="nomad-workload"] | all' < consul.json

‎mkosi.images/base/mkosi.postinst.d/substitute-import-keyring‎

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
#!/bin/bash
2+
3+
if [ "${MKOSI_DEBUG:-}" = "1" ]
4+
then
5+
set -x
6+
fi
7+
8+
keyring="$(mktemp)"
9+
GNUPGHOME=$(pwd)/.gnupg gpg --export | gpg --no-default-keyring --keyring "${keyring}" --import
10+
cp "${keyring}" ${BUILDROOT}/usr/lib/systemd/import-pubring.pgp

‎mkosi.images/consul/mkosi.version‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
1.22.1-1
1+
1.22.2-1

‎mkosi.images/initrd/mkosi.extra/usr/lib/mangos/mangos-install‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ mkdir /boot
5555
mount /dev/disk/by-partuuid/${boot_uuid@L} /boot
5656

5757
# Apply the partition table to the target device.
58-
$echo systemd-repart --dry-run=no --empty=force --defer-partitions=swap,tmp,var --root=/ --definitions=/usr/lib/repart.installer.d "${install_target}"
58+
$echo systemd-repart --dry-run=no --empty=force --defer-partitions=swap,tmp,var --root=/ --definitions=/usr/lib/repart.d "${install_target}"
5959

6060
# It would be neat if we coould use sd-sysypdate for the root partition, too,
6161
# but if there's not existing root partition on its target device, it bails.
@@ -95,7 +95,7 @@ umount /mnt/etc/kernel/entry-token
9595
cp /boot/EFI/BOOT/BOOTX64.EFI /mnt/boot/EFI/BOOT/BOOTX64.EFI
9696
cp /boot/EFI/BOOT/BOOTX64.EFI /mnt/boot/EFI/systemd/systemd-bootx64.efi
9797

98-
if [ ! -f /sys/firmware/efi ]
98+
if [ ! -e /sys/firmware/efi ]
9999
then
100100
ip_arg="$(grep -oE 'ip=[^ ]+' /proc/cmdline)"
101101
nameserver_arg="$(grep -oE 'nameserver=[^ ]+' /proc/cmdline)"

‎mkosi.images/nomad/mkosi.version‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
1.11.0-1
1+
1.11.1-1

0 commit comments

Comments
 (0)