Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in
Toggle navigation
Menu
Open sidebar
Kristian Klausen
arch-boxes
Commits
5499cffb
Commit
5499cffb
authored
Dec 01, 2020
by
Sven-Hendrik Haase
Browse files
Merge branch 'issues/121' into 'master'
Order pacman-init before cloud-final Closes
#121
See merge request
!147
parents
03a72dca
312d9334
Changes
2
Hide whitespace changes
Inline
Side-by-side
.gitlab-ci.yml
View file @
5499cffb
...
...
@@ -86,6 +86,13 @@ test-cloudimg-qemu:
password: '${SSHPASS}'
chpasswd: { expire: False }
ssh_pwauth: True
packages:
- tmux
- tree
runcmd:
- [ echo, 'Install more packages using runcmd.' ]
- [ pacman, --noconfirm, -Syu, bat ]
- [ touch, /runcmd_successful ]
EOF
-
|
cat > meta-data <<EOF
...
...
@@ -96,6 +103,8 @@ test-cloudimg-qemu:
-
genisoimage -output seed.iso -volid cidata -joliet -rock user-data meta-data
-
qemu-system-x86_64 -m 512 -net nic -net user,hostfwd=tcp::2222-:22 -drive file=$(ls output/Arch-Linux-x86_64-cloudimg-*.qcow2),if=virtio -drive file=seed.iso,if=virtio -nographic &
-
timeout 15m sh -c "while ! sshpass -e ssh -o ConnectTimeout=2 -o StrictHostKeyChecking=no arch@localhost -p 2222
true
; do sleep 1; done"
-
timeout 15m sh -c "while ! sshpass -e ssh -o ConnectTimeout=2 -o StrictHostKeyChecking=no arch@localhost -p 2222 pacman -Q bat tmux tree; do sleep 1; done"
-
timeout 15m sh -c "while ! sshpass -e ssh -o ConnectTimeout=2 -o StrictHostKeyChecking=no arch@localhost -p 2222 test -f /runcmd_successful ; do sleep 1; done"
tag_release
:
stage
:
publish
...
...
http/install-common.sh
View file @
5499cffb
...
...
@@ -9,7 +9,7 @@ cat <<EOF >/etc/systemd/system/pacman-init.service
Description=Initializes Pacman keyring
Wants=haveged.service
After=haveged.service
Before=sshd.service
Before=sshd.service
cloud-final.service
ConditionFirstBoot=yes
[Service]
...
...
@@ -28,7 +28,7 @@ cat <<EOF >/etc/systemd/system/reflector-init.service
Description=Initializes mirrors for the VM
After=network-online.target
Wants=network-online.target
Before=sshd.service
Before=sshd.service
cloud-final.service
ConditionFirstBoot=yes
[Service]
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment