Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Gate run requires epel targets #315

Closed
wants to merge 5 commits into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 14 additions & 5 deletions .packit.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -18,9 +18,12 @@ jobs:
# x86_64 is assumed by default
# qm is noarch so we only need to test on one arch
targets:
- fedora-rawhide
- fedora-latest
- centos-stream-9
fedora-rawhide: {}
fedora-latest: {}
centos-stream-9:
additional_repos:
- https://dl.fedoraproject.org/pub/epel/9/Everything/x86_64/
- https://download.copr.fedorainfracloud.org/results/@centos-automotive-sig/bluechi-snapshot/centos-stream-9-x86_64/

# Run on commit to main branch
- &copr
Expand Down Expand Up @@ -68,7 +71,10 @@ jobs:
- centos-stream-9-x86_64
tf_extra_params:
environments:
- hardware:
- artifacts:
- type: repository-file
id: https://copr.fedorainfracloud.org/coprs/g/centos-automotive-sig/bluechi-snapshot/repo/centos-stream-9
hardware:
disk:
- size: ">= 20 GB"

Expand All @@ -81,7 +87,10 @@ jobs:
- centos-stream-9-x86_64
tf_extra_params:
environments:
- tmt:
- artifacts:
- type: repository-file
id: https://copr.fedorainfracloud.org/coprs/g/centos-automotive-sig/bluechi-snapshot/repo/centos-stream-9
tmt:
context:
scenario : "ffi"
hardware:
Expand Down
1 change: 1 addition & 0 deletions qm.container
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,7 @@ ReadOnly=true
# Ref: https://github.com/containers/podman/issues/20439
VolatileTmp=true
Rootfs=${ROOTFS}
GlobalArgs=--log-level=debug

# FIXME: QM is failing to start if SecurityLabelNested is enabled.
# Add back as soon podman 4.7 is released.
Expand Down
2 changes: 1 addition & 1 deletion setup
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#! /bin/bash -e
#! /bin/bash -ex
#
# This setup script will install an OS environment by default into
# /usr/lib/qm/rootfs and create a Podman quadlet containerized environment
Expand Down
2 changes: 1 addition & 1 deletion tests/e2e/lib/container
Original file line number Diff line number Diff line change
Expand Up @@ -81,7 +81,7 @@ setup_node() {
cp ./lib/ContainerFile.template ContainerFile.node"${nodeID}"
if_error_exit "failed to copy ContainerFile control template to node!"
if [ -n "${use_copr_repo}" ]; then
sed -e "/crb/a RUN dnf -y copr enable ${use_copr_repo} centos-stream-9" -i ContainerFile.node"${nodeID}"
sed -e "/crb/a RUN dnf -y copr enable ${use_copr_repo}" -i ContainerFile.node"${nodeID}"
if_error_exit "failed to sed ContainerFile node template!"
fi
# remove specific code from control mode (template)
Expand Down
11 changes: 8 additions & 3 deletions tests/e2e/set-ffi-env-e2e
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
#!/bin/bash

set -eoux pipefail
#set -eoux pipefail
set -x

# shellcheck disable=SC1091
#
Expand Down Expand Up @@ -186,9 +187,9 @@ install_qm_rpms() {
dnf config-manager --set-enabled crb
dnf copr enable -y @centos-automotive-sig/bluechi-snapshot centos-stream-9-"${ARCH}"
if [ -n "${USE_QM_COPR}" ]; then
dnf copr enable -y "${USE_QM_COPR}" centos-stream-9-"${ARCH}"
dnf copr enable -y "${USE_QM_COPR}"
fi
dnf install -y bluechi-ctl bluechi-agent bluechi qm podman hostname
dnf install -y bluechi-ctl bluechi-agent bluechi-controller qm podman hostname
}

setup_qm_services() {
Expand All @@ -204,6 +205,10 @@ setup_qm_services() {
# Curl files into here,
# Fix: default setup:main should be removed on next qm release
/usr/share/qm/setup --hostname localrootfs
rc="$?"
if [ "${rc}" -ne 0 ]; then
exec_cmd "systemctl status -l --no-pager qm.service"
fi
cat > /etc/bluechi/controller.conf << 'EOF'
[bluechi-controller]
AllowedNodeNames=qm.localrootfs,localrootfs
Expand Down