Commit 3c8d88e5 authored by Peter Hutterer's avatar Peter Hutterer
Browse files

Log the vm to the serial console



This adds systemd.journald.forward_to_console=1 to the mkosi
KernelCommandLine, so we can see all potential boot errors in the
console.out file.
Signed-off-by: Peter Hutterer's avatarPeter Hutterer <peter.hutterer@who-t.net>
parent e2e678d3
......@@ -202,7 +202,7 @@ pages:
#
.publish.template:
stage: publish
image: $CI_REGISTRY_IMAGE/x86_64/buildah:2020-12-16.2
image: $CI_REGISTRY_IMAGE/x86_64/buildah:2020-12-16.3
script:
- skopeo login --username "$QUAY_USER" --password "$(cat $QUAY_TOKEN)" quay.io
- set -x
......@@ -251,7 +251,7 @@ publish to quay.io:
- x86_64
- aarch64
FDO_DISTRIBUTION_TAG:
- '2020-12-16.2'
- '2020-12-16.3'
- FDO_DISTRIBUTION_IMAGE:
- qemu
- qemu-mkosi
......@@ -260,7 +260,7 @@ publish to quay.io:
FDO_ARCHITECTURE:
- x86_64
FDO_DISTRIBUTION_TAG:
- '2020-12-16.2'
- '2020-12-16.3'
variables:
# local format, e.g. x86_64/mkosi-base-12324
# distant format, e.g. mkosi-base-x86_64-12324
......@@ -287,13 +287,13 @@ publish ci-fairy to quay.io:
# exist
#
test published images:
image: $CI_REGISTRY_IMAGE/x86_64/buildah:2020-12-16.2
image: $CI_REGISTRY_IMAGE/x86_64/buildah:2020-12-16.3
stage: test published images
script:
- skopeo inspect docker://quay.io/freedesktop.org/ci-templates:buildah-aarch64-2020-12-16.2
- skopeo inspect docker://quay.io/freedesktop.org/ci-templates:buildah-x86_64-2020-12-16.2
- skopeo inspect docker://quay.io/freedesktop.org/ci-templates:buildah-aarch64-2020-12-16.3
- skopeo inspect docker://quay.io/freedesktop.org/ci-templates:buildah-x86_64-2020-12-16.3
- skopeo inspect docker://quay.io/freedesktop.org/ci-templates:ci-fairy-sha256-936060119966b261c07af69d9422ee970cb2f37a355ba8509dceeaee70633349
- skopeo inspect docker://quay.io/freedesktop.org/ci-templates:qemu-base-x86_64-2020-12-16.2
- skopeo inspect docker://quay.io/freedesktop.org/ci-templates:qemu-mkosi-base-x86_64-2020-12-16.2
- skopeo inspect docker://quay.io/freedesktop.org/ci-templates:qemu-base-x86_64-2020-12-16.3
- skopeo inspect docker://quay.io/freedesktop.org/ci-templates:qemu-mkosi-base-x86_64-2020-12-16.3
rules:
- if: '$CI_COMMIT_BRANCH == "master" && $CI_PROJECT_PATH == "freedesktop/ci-templates"'
\ No newline at end of file
......@@ -43,7 +43,7 @@ stages:
extends:
- .fdo.container-build@alpine@x86_64
- .ci-commons-alpine@x86_64
image: $CI_REGISTRY_IMAGE/x86_64/buildah:2020-12-16.2
image: $CI_REGISTRY_IMAGE/x86_64/buildah:2020-12-16.3
stage: alpine_container_build
......@@ -51,7 +51,7 @@ stages:
extends:
- .fdo.container-build@alpine@aarch64
- .ci-commons-alpine@aarch64
image: $CI_REGISTRY_IMAGE/aarch64/buildah:2020-12-16.2
image: $CI_REGISTRY_IMAGE/aarch64/buildah:2020-12-16.3
stage: alpine_container_build
......@@ -194,7 +194,7 @@ do not rebuild alpine:latest@container-build@x86_64:
check labels alpine@x86_64:latest:
extends:
- alpine:latest@check@x86_64
image: $CI_REGISTRY_IMAGE/x86_64/buildah:2020-12-16.2
image: $CI_REGISTRY_IMAGE/x86_64/buildah:2020-12-16.3
script:
# FDO_DISTRIBUTION_IMAGE still has indirections
- DISTRO_IMAGE=$(eval echo ${FDO_DISTRIBUTION_IMAGE})
......
......@@ -43,7 +43,7 @@ stages:
extends:
- .fdo.container-build@arch@x86_64
- .ci-commons-arch@x86_64
image: $CI_REGISTRY_IMAGE/x86_64/buildah:2020-12-16.2
image: $CI_REGISTRY_IMAGE/x86_64/buildah:2020-12-16.3
stage: arch_container_build
......@@ -170,7 +170,7 @@ do not rebuild arch:rolling@container-build@x86_64:
check labels arch@x86_64:rolling:
extends:
- arch:rolling@check@x86_64
image: $CI_REGISTRY_IMAGE/x86_64/buildah:2020-12-16.2
image: $CI_REGISTRY_IMAGE/x86_64/buildah:2020-12-16.3
script:
# FDO_DISTRIBUTION_IMAGE still has indirections
- DISTRO_IMAGE=$(eval echo ${FDO_DISTRIBUTION_IMAGE})
......
......@@ -20,7 +20,7 @@ stages:
variables:
FDO_UPSTREAM_REPO: freedesktop/ci-templates
FDO_DISTRIBUTION_VERSION: '33'
FDO_DISTRIBUTION_TAG: '2020-12-16.2'
FDO_DISTRIBUTION_TAG: '2020-12-16.3'
# we need a minimalist image capable of buildah, podman, skopeo, curl,
......@@ -54,12 +54,12 @@ stages:
# - usbutils (for being able to call lsusb and redirect part a USB device)
.qemu@x86_64:
extends: .bootstrap_skeleton@x86_64
image: $CI_REGISTRY_IMAGE/x86_64/buildah:2020-12-16.2
image: $CI_REGISTRY_IMAGE/x86_64/buildah:2020-12-16.3
stage: bootstrapping_qemu
dependencies: []
variables:
FDO_DISTRIBUTION_TAG: '2020-12-16.2'
FDO_BASE_IMAGE: $CI_REGISTRY_IMAGE/x86_64/buildah:2020-12-16.2
FDO_DISTRIBUTION_TAG: '2020-12-16.3'
FDO_BASE_IMAGE: $CI_REGISTRY_IMAGE/x86_64/buildah:2020-12-16.3
FDO_REPO_SUFFIX: x86_64/qemu-base
FDO_DISTRIBUTION_PACKAGES: 'qemu genisoimage usbutils'
FDO_DISTRIBUTION_EXEC: 'mkdir -p /app && cp bootstrap/vmctl.sh /app/vmctl'
......
......@@ -44,7 +44,7 @@ stages:
extends:
- .fdo.container-build@centos@x86_64
- .ci-commons-centos@x86_64
image: $CI_REGISTRY_IMAGE/x86_64/buildah:2020-12-16.2
image: $CI_REGISTRY_IMAGE/x86_64/buildah:2020-12-16.3
stage: centos_container_build
......@@ -171,7 +171,7 @@ do not rebuild centos:7@container-build@x86_64:
check labels centos@x86_64:7:
extends:
- centos:7@check@x86_64
image: $CI_REGISTRY_IMAGE/x86_64/buildah:2020-12-16.2
image: $CI_REGISTRY_IMAGE/x86_64/buildah:2020-12-16.3
script:
# FDO_DISTRIBUTION_IMAGE still has indirections
- DISTRO_IMAGE=$(eval echo ${FDO_DISTRIBUTION_IMAGE})
......
......@@ -44,7 +44,7 @@ stages:
extends:
- .fdo.container-build@debian@x86_64
- .ci-commons-debian@x86_64
image: $CI_REGISTRY_IMAGE/x86_64/buildah:2020-12-16.2
image: $CI_REGISTRY_IMAGE/x86_64/buildah:2020-12-16.3
stage: debian_container_build
......@@ -52,7 +52,7 @@ stages:
extends:
- .fdo.container-build@debian@aarch64
- .ci-commons-debian@aarch64
image: $CI_REGISTRY_IMAGE/aarch64/buildah:2020-12-16.2
image: $CI_REGISTRY_IMAGE/aarch64/buildah:2020-12-16.3
stage: debian_container_build
......@@ -63,7 +63,7 @@ stages:
extends:
- .fdo.qemu-build@debian@x86_64
- .ci-commons-debian@x86_64
image: $CI_REGISTRY_IMAGE/x86_64/qemu-mkosi-base:2020-12-16.2
image: $CI_REGISTRY_IMAGE/x86_64/qemu-mkosi-base:2020-12-16.3
stage: debian_container_build
artifacts:
name: logs-$CI_PIPELINE_ID
......@@ -230,7 +230,7 @@ debian:stretch@qemu-build@x86_64:
variables:
FDO_DISTRIBUTION_TAG: fdo-ci-qemu-x86_64-$CI_PIPELINE_ID
FDO_DISTRIBUTION_PACKAGES: 'wget curl'
QEMU_BASE_IMAGE: $CI_REGISTRY_IMAGE/x86_64/qemu-base:2020-12-16.2
QEMU_BASE_IMAGE: $CI_REGISTRY_IMAGE/x86_64/qemu-base:2020-12-16.3
debian:stretch@qemu-check@x86_64:
......@@ -260,7 +260,7 @@ do not rebuild debian:stretch@container-build@x86_64:
check labels debian@x86_64:stretch:
extends:
- debian:stretch@check@x86_64
image: $CI_REGISTRY_IMAGE/x86_64/buildah:2020-12-16.2
image: $CI_REGISTRY_IMAGE/x86_64/buildah:2020-12-16.3
script:
# FDO_DISTRIBUTION_IMAGE still has indirections
- DISTRO_IMAGE=$(eval echo ${FDO_DISTRIBUTION_IMAGE})
......
......@@ -44,7 +44,7 @@ stages:
extends:
- .fdo.container-build@fedora@x86_64
- .ci-commons-fedora@x86_64
image: $CI_REGISTRY_IMAGE/x86_64/buildah:2020-12-16.2
image: $CI_REGISTRY_IMAGE/x86_64/buildah:2020-12-16.3
stage: fedora_container_build
......@@ -52,7 +52,7 @@ stages:
extends:
- .fdo.container-build@fedora@aarch64
- .ci-commons-fedora@aarch64
image: $CI_REGISTRY_IMAGE/aarch64/buildah:2020-12-16.2
image: $CI_REGISTRY_IMAGE/aarch64/buildah:2020-12-16.3
stage: fedora_container_build
......@@ -63,7 +63,7 @@ stages:
extends:
- .fdo.qemu-build@fedora@x86_64
- .ci-commons-fedora@x86_64
image: $CI_REGISTRY_IMAGE/x86_64/qemu-mkosi-base:2020-12-16.2
image: $CI_REGISTRY_IMAGE/x86_64/qemu-mkosi-base:2020-12-16.3
stage: fedora_container_build
artifacts:
name: logs-$CI_PIPELINE_ID
......@@ -230,7 +230,7 @@ fedora:32@qemu-build@x86_64:
variables:
FDO_DISTRIBUTION_TAG: fdo-ci-qemu-x86_64-$CI_PIPELINE_ID
FDO_DISTRIBUTION_PACKAGES: 'wget curl'
QEMU_BASE_IMAGE: $CI_REGISTRY_IMAGE/x86_64/qemu-base:2020-12-16.2
QEMU_BASE_IMAGE: $CI_REGISTRY_IMAGE/x86_64/qemu-base:2020-12-16.3
fedora:32@qemu-check@x86_64:
......@@ -260,7 +260,7 @@ do not rebuild fedora:32@container-build@x86_64:
check labels fedora@x86_64:32:
extends:
- fedora:32@check@x86_64
image: $CI_REGISTRY_IMAGE/x86_64/buildah:2020-12-16.2
image: $CI_REGISTRY_IMAGE/x86_64/buildah:2020-12-16.3
script:
# FDO_DISTRIBUTION_IMAGE still has indirections
- DISTRO_IMAGE=$(eval echo ${FDO_DISTRIBUTION_IMAGE})
......
......@@ -44,7 +44,7 @@ stages:
extends:
- .fdo.container-build@ubuntu@x86_64
- .ci-commons-ubuntu@x86_64
image: $CI_REGISTRY_IMAGE/x86_64/buildah:2020-12-16.2
image: $CI_REGISTRY_IMAGE/x86_64/buildah:2020-12-16.3
stage: ubuntu_container_build
......@@ -52,7 +52,7 @@ stages:
extends:
- .fdo.container-build@ubuntu@aarch64
- .ci-commons-ubuntu@aarch64
image: $CI_REGISTRY_IMAGE/aarch64/buildah:2020-12-16.2
image: $CI_REGISTRY_IMAGE/aarch64/buildah:2020-12-16.3
stage: ubuntu_container_build
......@@ -63,7 +63,7 @@ stages:
extends:
- .fdo.qemu-build@ubuntu@x86_64
- .ci-commons-ubuntu@x86_64
image: $CI_REGISTRY_IMAGE/x86_64/qemu-mkosi-base:2020-12-16.2
image: $CI_REGISTRY_IMAGE/x86_64/qemu-mkosi-base:2020-12-16.3
stage: ubuntu_container_build
artifacts:
name: logs-$CI_PIPELINE_ID
......@@ -230,7 +230,7 @@ ubuntu:18.04@qemu-build@x86_64:
variables:
FDO_DISTRIBUTION_TAG: fdo-ci-qemu-x86_64-$CI_PIPELINE_ID
FDO_DISTRIBUTION_PACKAGES: 'wget curl'
QEMU_BASE_IMAGE: $CI_REGISTRY_IMAGE/x86_64/qemu-base:2020-12-16.2
QEMU_BASE_IMAGE: $CI_REGISTRY_IMAGE/x86_64/qemu-base:2020-12-16.3
ubuntu:18.04@qemu-check@x86_64:
......@@ -260,7 +260,7 @@ do not rebuild ubuntu:18.04@container-build@x86_64:
check labels ubuntu@x86_64:18.04:
extends:
- ubuntu:18.04@check@x86_64
image: $CI_REGISTRY_IMAGE/x86_64/buildah:2020-12-16.2
image: $CI_REGISTRY_IMAGE/x86_64/buildah:2020-12-16.3
script:
# FDO_DISTRIBUTION_IMAGE still has indirections
- DISTRO_IMAGE=$(eval echo ${FDO_DISTRIBUTION_IMAGE})
......
## @bootstrap_tag: the current image tag associated with this bootstrap image
bootstrap_tag: '2020-12-16.2'
bootstrap_tag: '2020-12-16.3'
## @qemu_tag: the current image tag associated with this qemu bootstrap image
qemu_tag: '2020-12-16.2'
qemu_tag: '2020-12-16.3'
## @ci_templates_registry_path: the path to where the templates should look
## for bootstrap images.
......
......@@ -420,7 +420,7 @@
Bootable=yes
BootProtocols=bios
Password=root
KernelCommandLine=!* selinux=0 audit=0 rw console=tty0 console=ttyS0
KernelCommandLine=!* selinux=0 audit=0 rw console=tty0 console=ttyS0 systemd.journald.forward_to_console=1
[Partitions]
RootSize=2G
......
......@@ -307,7 +307,7 @@
#
.fdo.container-build@alpine@x86_64:
extends: .fdo.container-build-common@alpine
image: quay.io/freedesktop.org/ci-templates:buildah-x86_64-2020-12-16.2
image: quay.io/freedesktop.org/ci-templates:buildah-x86_64-2020-12-16.3
###
# Alias to ``.fdo.container-build@alpine@x86_64``.
......@@ -324,7 +324,7 @@
# See ``.fdo.container-build@alpine@x86_64`` for details.
.fdo.container-build@alpine@aarch64:
extends: .fdo.container-build-common@alpine
image: quay.io/freedesktop.org/ci-templates:buildah-aarch64-2020-12-16.2
image: quay.io/freedesktop.org/ci-templates:buildah-aarch64-2020-12-16.3
tags:
- aarch64
......
......@@ -307,7 +307,7 @@
#
.fdo.container-build@arch@x86_64:
extends: .fdo.container-build-common@arch
image: quay.io/freedesktop.org/ci-templates:buildah-x86_64-2020-12-16.2
image: quay.io/freedesktop.org/ci-templates:buildah-x86_64-2020-12-16.3
###
# Alias to ``.fdo.container-build@arch@x86_64``.
......
......@@ -312,7 +312,7 @@
#
.fdo.container-build@centos@x86_64:
extends: .fdo.container-build-common@centos
image: quay.io/freedesktop.org/ci-templates:buildah-x86_64-2020-12-16.2
image: quay.io/freedesktop.org/ci-templates:buildah-x86_64-2020-12-16.3
###
# Alias to ``.fdo.container-build@centos@x86_64``.
......
......@@ -322,7 +322,7 @@
#
.fdo.container-build@debian@x86_64:
extends: .fdo.container-build-common@debian
image: quay.io/freedesktop.org/ci-templates:buildah-x86_64-2020-12-16.2
image: quay.io/freedesktop.org/ci-templates:buildah-x86_64-2020-12-16.3
###
# Alias to ``.fdo.container-build@debian@x86_64``.
......@@ -339,7 +339,7 @@
# See ``.fdo.container-build@debian@x86_64`` for details.
.fdo.container-build@debian@aarch64:
extends: .fdo.container-build-common@debian
image: quay.io/freedesktop.org/ci-templates:buildah-aarch64-2020-12-16.2
image: quay.io/freedesktop.org/ci-templates:buildah-aarch64-2020-12-16.3
tags:
- aarch64
......@@ -355,7 +355,7 @@
extends: .fdo.container-build@debian@x86_64
tags:
- kvm
image: quay.io/freedesktop.org/ci-templates:qemu-mkosi-base-x86_64-2020-12-16.2
image: quay.io/freedesktop.org/ci-templates:qemu-mkosi-base-x86_64-2020-12-16.3
script:
# log in to the registry
- podman login -u $CI_REGISTRY_USER -p $CI_REGISTRY_PASSWORD $CI_REGISTRY
......@@ -381,7 +381,7 @@
Bootable=yes
BootProtocols=bios
Password=root
KernelCommandLine=!* selinux=0 audit=0 rw console=tty0 console=ttyS0
KernelCommandLine=!* selinux=0 audit=0 rw console=tty0 console=ttyS0 systemd.journald.forward_to_console=1
[Partitions]
RootSize=2G
......@@ -453,7 +453,7 @@
graphroot = "/var/lib/containers/storage"
EOF
- QEMU_BASE_IMAGE=${QEMU_BASE_IMAGE:-quay.io/freedesktop.org/ci-templates:qemu-base-x86_64-2020-12-16.2}
- QEMU_BASE_IMAGE=${QEMU_BASE_IMAGE:-quay.io/freedesktop.org/ci-templates:qemu-base-x86_64-2020-12-16.3}
- echo Building $FDO_REPO_SUFFIX:$DISTRO_TAG from $QEMU_BASE_IMAGE
......
......@@ -312,7 +312,7 @@
#
.fdo.container-build@fedora@x86_64:
extends: .fdo.container-build-common@fedora
image: quay.io/freedesktop.org/ci-templates:buildah-x86_64-2020-12-16.2
image: quay.io/freedesktop.org/ci-templates:buildah-x86_64-2020-12-16.3
###
# Alias to ``.fdo.container-build@fedora@x86_64``.
......@@ -329,7 +329,7 @@
# See ``.fdo.container-build@fedora@x86_64`` for details.
.fdo.container-build@fedora@aarch64:
extends: .fdo.container-build-common@fedora
image: quay.io/freedesktop.org/ci-templates:buildah-aarch64-2020-12-16.2
image: quay.io/freedesktop.org/ci-templates:buildah-aarch64-2020-12-16.3
tags:
- aarch64
......@@ -345,7 +345,7 @@
extends: .fdo.container-build@fedora@x86_64
tags:
- kvm
image: quay.io/freedesktop.org/ci-templates:qemu-mkosi-base-x86_64-2020-12-16.2
image: quay.io/freedesktop.org/ci-templates:qemu-mkosi-base-x86_64-2020-12-16.3
script:
# log in to the registry
- podman login -u $CI_REGISTRY_USER -p $CI_REGISTRY_PASSWORD $CI_REGISTRY
......@@ -371,7 +371,7 @@
Bootable=yes
BootProtocols=bios
Password=root
KernelCommandLine=!* selinux=0 audit=0 rw console=tty0 console=ttyS0
KernelCommandLine=!* selinux=0 audit=0 rw console=tty0 console=ttyS0 systemd.journald.forward_to_console=1
[Partitions]
RootSize=2G
......@@ -444,7 +444,7 @@
graphroot = "/var/lib/containers/storage"
EOF
- QEMU_BASE_IMAGE=${QEMU_BASE_IMAGE:-quay.io/freedesktop.org/ci-templates:qemu-base-x86_64-2020-12-16.2}
- QEMU_BASE_IMAGE=${QEMU_BASE_IMAGE:-quay.io/freedesktop.org/ci-templates:qemu-base-x86_64-2020-12-16.3}
- echo Building $FDO_REPO_SUFFIX:$DISTRO_TAG from $QEMU_BASE_IMAGE
......
......@@ -321,7 +321,7 @@
#
.fdo.container-build@ubuntu@x86_64:
extends: .fdo.container-build-common@ubuntu
image: quay.io/freedesktop.org/ci-templates:buildah-x86_64-2020-12-16.2
image: quay.io/freedesktop.org/ci-templates:buildah-x86_64-2020-12-16.3
###
# Alias to ``.fdo.container-build@ubuntu@x86_64``.
......@@ -338,7 +338,7 @@
# See ``.fdo.container-build@ubuntu@x86_64`` for details.
.fdo.container-build@ubuntu@aarch64:
extends: .fdo.container-build-common@ubuntu
image: quay.io/freedesktop.org/ci-templates:buildah-aarch64-2020-12-16.2
image: quay.io/freedesktop.org/ci-templates:buildah-aarch64-2020-12-16.3
tags:
- aarch64
......@@ -354,7 +354,7 @@
extends: .fdo.container-build@ubuntu@x86_64
tags:
- kvm
image: quay.io/freedesktop.org/ci-templates:qemu-mkosi-base-x86_64-2020-12-16.2
image: quay.io/freedesktop.org/ci-templates:qemu-mkosi-base-x86_64-2020-12-16.3
script:
# log in to the registry
- podman login -u $CI_REGISTRY_USER -p $CI_REGISTRY_PASSWORD $CI_REGISTRY
......@@ -422,7 +422,7 @@
Bootable=yes
BootProtocols=bios
Password=root
KernelCommandLine=!* selinux=0 audit=0 rw console=tty0 console=ttyS0
KernelCommandLine=!* selinux=0 audit=0 rw console=tty0 console=ttyS0 systemd.journald.forward_to_console=1
[Partitions]
RootSize=2G
......@@ -496,7 +496,7 @@
graphroot = "/var/lib/containers/storage"
EOF
- QEMU_BASE_IMAGE=${QEMU_BASE_IMAGE:-quay.io/freedesktop.org/ci-templates:qemu-base-x86_64-2020-12-16.2}
- QEMU_BASE_IMAGE=${QEMU_BASE_IMAGE:-quay.io/freedesktop.org/ci-templates:qemu-base-x86_64-2020-12-16.3}
- echo Building $FDO_REPO_SUFFIX:$DISTRO_TAG from $QEMU_BASE_IMAGE
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment