From b8441b17f9749822efcd064cd1b7e076581fb363 Mon Sep 17 00:00:00 2001 From: Toni Saario Date: Fri, 5 Sep 2025 13:08:19 +0300 Subject: [PATCH] Delete macOS GCA keys and dhcp lease after provisioning MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This ensures that link-local IPv6 address is unique per each VM. Task-number: QTQAINFRA-7383 Pick-to: 6.9 6.8 6.5 Change-Id: I53434ec3a158cec09f03c96087a401ef05f47b86 Reviewed-by: Tor Arne Vestbø (cherry picked from commit b8995e0ebc9d6fb4e2ad4d544506abfbac6ad4f5) Reviewed-by: Qt Cherry-pick Bot --- coin/provisioning/common/macos/clean_gca_keys.sh | 9 +++++++++ .../qtci-macos-10.15-x86_64/99-clean_gca_keys.sh | 3 +++ coin/provisioning/qtci-macos-11-arm/99-clean_gca_keys.sh | 3 +++ .../qtci-macos-11-x86_64/99-clean_gca_keys.sh | 3 +++ coin/provisioning/qtci-macos-12-arm/99-clean_gca_keys.sh | 3 +++ .../qtci-macos-12-x86_64/99-clean_gca_keys.sh | 3 +++ coin/provisioning/qtci-macos-13-arm/99-clean_gca_keys.sh | 3 +++ .../qtci-macos-13-x86_64/99-clean_gca_keys.sh | 3 +++ coin/provisioning/qtci-macos-14-arm/99-clean_gca_keys.sh | 3 +++ .../qtci-macos-14-x86_64/99-clean_gca_keys.sh | 3 +++ coin/provisioning/qtci-macos-15-arm/99-clean_gca_keys.sh | 3 +++ .../qtci-macos-15-x86_64/99-clean_gca_keys.sh | 3 +++ coin/provisioning/qtci-macos-26-arm/99-clean_gca_keys.sh | 3 +++ 13 files changed, 45 insertions(+) create mode 100755 coin/provisioning/common/macos/clean_gca_keys.sh create mode 100755 coin/provisioning/qtci-macos-10.15-x86_64/99-clean_gca_keys.sh create mode 100755 coin/provisioning/qtci-macos-11-arm/99-clean_gca_keys.sh create mode 100755 coin/provisioning/qtci-macos-11-x86_64/99-clean_gca_keys.sh create mode 100755 coin/provisioning/qtci-macos-12-arm/99-clean_gca_keys.sh create mode 100755 coin/provisioning/qtci-macos-12-x86_64/99-clean_gca_keys.sh create mode 100755 coin/provisioning/qtci-macos-13-arm/99-clean_gca_keys.sh create mode 100755 coin/provisioning/qtci-macos-13-x86_64/99-clean_gca_keys.sh create mode 100755 coin/provisioning/qtci-macos-14-arm/99-clean_gca_keys.sh create mode 100755 coin/provisioning/qtci-macos-14-x86_64/99-clean_gca_keys.sh create mode 100755 coin/provisioning/qtci-macos-15-arm/99-clean_gca_keys.sh create mode 100755 coin/provisioning/qtci-macos-15-x86_64/99-clean_gca_keys.sh create mode 100755 coin/provisioning/qtci-macos-26-arm/99-clean_gca_keys.sh diff --git a/coin/provisioning/common/macos/clean_gca_keys.sh b/coin/provisioning/common/macos/clean_gca_keys.sh new file mode 100755 index 00000000..451fde35 --- /dev/null +++ b/coin/provisioning/common/macos/clean_gca_keys.sh @@ -0,0 +1,9 @@ +#!/bin/bash +# Copyright (C) 2025 The Qt Company Ltd. +# SPDX-License-Identifier: LicenseRef-Qt-Commercial OR LGPL-3.0-only OR GPL-2.0-only OR GPL-3.0-only + +# Delete GCA plists and leases plist to force their regeneration after next reboot +# This avoids IPv6 link-local address collision that would happen with +# multiple VMs from same image. + +sudo rm -rf /var/db/dhcpclient diff --git a/coin/provisioning/qtci-macos-10.15-x86_64/99-clean_gca_keys.sh b/coin/provisioning/qtci-macos-10.15-x86_64/99-clean_gca_keys.sh new file mode 100755 index 00000000..c336409d --- /dev/null +++ b/coin/provisioning/qtci-macos-10.15-x86_64/99-clean_gca_keys.sh @@ -0,0 +1,3 @@ +#!/bin/sh + +"$(dirname "$0")"/../common/macos/clean_gca_keys.sh diff --git a/coin/provisioning/qtci-macos-11-arm/99-clean_gca_keys.sh b/coin/provisioning/qtci-macos-11-arm/99-clean_gca_keys.sh new file mode 100755 index 00000000..c336409d --- /dev/null +++ b/coin/provisioning/qtci-macos-11-arm/99-clean_gca_keys.sh @@ -0,0 +1,3 @@ +#!/bin/sh + +"$(dirname "$0")"/../common/macos/clean_gca_keys.sh diff --git a/coin/provisioning/qtci-macos-11-x86_64/99-clean_gca_keys.sh b/coin/provisioning/qtci-macos-11-x86_64/99-clean_gca_keys.sh new file mode 100755 index 00000000..c336409d --- /dev/null +++ b/coin/provisioning/qtci-macos-11-x86_64/99-clean_gca_keys.sh @@ -0,0 +1,3 @@ +#!/bin/sh + +"$(dirname "$0")"/../common/macos/clean_gca_keys.sh diff --git a/coin/provisioning/qtci-macos-12-arm/99-clean_gca_keys.sh b/coin/provisioning/qtci-macos-12-arm/99-clean_gca_keys.sh new file mode 100755 index 00000000..c336409d --- /dev/null +++ b/coin/provisioning/qtci-macos-12-arm/99-clean_gca_keys.sh @@ -0,0 +1,3 @@ +#!/bin/sh + +"$(dirname "$0")"/../common/macos/clean_gca_keys.sh diff --git a/coin/provisioning/qtci-macos-12-x86_64/99-clean_gca_keys.sh b/coin/provisioning/qtci-macos-12-x86_64/99-clean_gca_keys.sh new file mode 100755 index 00000000..c336409d --- /dev/null +++ b/coin/provisioning/qtci-macos-12-x86_64/99-clean_gca_keys.sh @@ -0,0 +1,3 @@ +#!/bin/sh + +"$(dirname "$0")"/../common/macos/clean_gca_keys.sh diff --git a/coin/provisioning/qtci-macos-13-arm/99-clean_gca_keys.sh b/coin/provisioning/qtci-macos-13-arm/99-clean_gca_keys.sh new file mode 100755 index 00000000..c336409d --- /dev/null +++ b/coin/provisioning/qtci-macos-13-arm/99-clean_gca_keys.sh @@ -0,0 +1,3 @@ +#!/bin/sh + +"$(dirname "$0")"/../common/macos/clean_gca_keys.sh diff --git a/coin/provisioning/qtci-macos-13-x86_64/99-clean_gca_keys.sh b/coin/provisioning/qtci-macos-13-x86_64/99-clean_gca_keys.sh new file mode 100755 index 00000000..c336409d --- /dev/null +++ b/coin/provisioning/qtci-macos-13-x86_64/99-clean_gca_keys.sh @@ -0,0 +1,3 @@ +#!/bin/sh + +"$(dirname "$0")"/../common/macos/clean_gca_keys.sh diff --git a/coin/provisioning/qtci-macos-14-arm/99-clean_gca_keys.sh b/coin/provisioning/qtci-macos-14-arm/99-clean_gca_keys.sh new file mode 100755 index 00000000..c336409d --- /dev/null +++ b/coin/provisioning/qtci-macos-14-arm/99-clean_gca_keys.sh @@ -0,0 +1,3 @@ +#!/bin/sh + +"$(dirname "$0")"/../common/macos/clean_gca_keys.sh diff --git a/coin/provisioning/qtci-macos-14-x86_64/99-clean_gca_keys.sh b/coin/provisioning/qtci-macos-14-x86_64/99-clean_gca_keys.sh new file mode 100755 index 00000000..c336409d --- /dev/null +++ b/coin/provisioning/qtci-macos-14-x86_64/99-clean_gca_keys.sh @@ -0,0 +1,3 @@ +#!/bin/sh + +"$(dirname "$0")"/../common/macos/clean_gca_keys.sh diff --git a/coin/provisioning/qtci-macos-15-arm/99-clean_gca_keys.sh b/coin/provisioning/qtci-macos-15-arm/99-clean_gca_keys.sh new file mode 100755 index 00000000..c336409d --- /dev/null +++ b/coin/provisioning/qtci-macos-15-arm/99-clean_gca_keys.sh @@ -0,0 +1,3 @@ +#!/bin/sh + +"$(dirname "$0")"/../common/macos/clean_gca_keys.sh diff --git a/coin/provisioning/qtci-macos-15-x86_64/99-clean_gca_keys.sh b/coin/provisioning/qtci-macos-15-x86_64/99-clean_gca_keys.sh new file mode 100755 index 00000000..c336409d --- /dev/null +++ b/coin/provisioning/qtci-macos-15-x86_64/99-clean_gca_keys.sh @@ -0,0 +1,3 @@ +#!/bin/sh + +"$(dirname "$0")"/../common/macos/clean_gca_keys.sh diff --git a/coin/provisioning/qtci-macos-26-arm/99-clean_gca_keys.sh b/coin/provisioning/qtci-macos-26-arm/99-clean_gca_keys.sh new file mode 100755 index 00000000..c336409d --- /dev/null +++ b/coin/provisioning/qtci-macos-26-arm/99-clean_gca_keys.sh @@ -0,0 +1,3 @@ +#!/bin/sh + +"$(dirname "$0")"/../common/macos/clean_gca_keys.sh