Skip to content
Merged
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
9 changes: 9 additions & 0 deletions acl/tests/kola_enforcing.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -26,16 +26,22 @@ tests:
- platforms: [qemu]
architectures: [aarch64]
reason: 3-node etcd cluster on TCG-emulated arm64 races systemd's DefaultDeviceTimeoutSec for /dev/disk/by-label/OEM; tracked by the OEM fsck conditional dropin work
- platforms: [azure]
reason: Azure version depends on discovery.etcd.io, which is unmaintained.

- name: acl.flannel.udp
exceptions:
- architectures: [aarch64]
reason: Flannel UDP coverage is registered only for amd64
- platforms: [azure]
reason: Azure version depends on discovery.etcd.io, which is unmaintained.
- name: acl.flannel.vxlan
exceptions:
- platforms: [qemu]
architectures: [aarch64]
reason: Flakiness on TCG-emulated arm64 in aclmain, failures due to slow device enumeration.
- platforms: [azure]
reason: Azure version depends on discovery.etcd.io, which is unmaintained.

- name: acl.internet
exceptions:
Expand Down Expand Up @@ -90,6 +96,9 @@ tests:

- name: cl.etcd-member.etcdctlv3
- name: cl.etcd-member.v2-backup-restore
exceptions:
- platforms: [azure]
reason: Azure version depends on discovery.etcd.io, which is unmaintained.

- name: cl.filesystem
exceptions:
Expand Down
24 changes: 15 additions & 9 deletions acl/tests/run-selinux-toggle-test.sh
Original file line number Diff line number Diff line change
Expand Up @@ -44,22 +44,28 @@ boot_id() {
ssh_cmd 'cat /proc/sys/kernel/random/boot_id' 2>/dev/null
}

# Set (or remove) the tag on the VM, then wait for in-guest IMDS to converge
# Set (or remove) the tag on the VM, then wait for in-guest IMDS to converge.
#
# Uses the generic ARM tag endpoint (`az tag update`) rather than
# `az vm update --set tags.…`. The latter round-trips the whole VM resource
# through the Compute RP, so it can fail on unrelated VM properties.
set_selinux_tag() {
local value="$1"
local vm_id
vm_id=$(az vm show --resource-group "$VM_RG" --name "$VM_NAME" --query id -o tsv)
if [[ -z "$value" ]]; then
info "Removing acl-node-security-profile tag..."
az vm update \
--resource-group "$VM_RG" \
--name "$VM_NAME" \
--remove tags.acl-node-security-profile \
az tag update \
--resource-id "$vm_id" \
--operation delete \
--tags "acl-node-security-profile=" \
Comment thread
jiria marked this conversation as resolved.
--output none
else
info "Setting acl-node-security-profile=${value}..."
az vm update \
--resource-group "$VM_RG" \
--name "$VM_NAME" \
--set "tags.acl-node-security-profile=${value}" \
az tag update \
--resource-id "$vm_id" \
--operation merge \
--tags "acl-node-security-profile=${value}" \
--output none
fi
info "Waiting for in-guest IMDS to report tag='${value:-<absent>}'..."
Expand Down
1 change: 1 addition & 0 deletions build_library/rpm/package_catalog.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,7 @@ packages:
- selinux-policy
- policycoreutils
- ca-certificates
- irqbalance
sys-libs/systemd-libs: systemd-libs
sys-apps/systemd-networkd: systemd-networkd
net-misc/systemd-networkd: systemd-networkd
Expand Down