From cc7b7fe630804ebc49ce816c9df5a363bb5fa28f Mon Sep 17 00:00:00 2001 From: Kevin Fenzi Date: Fri, 14 Feb 2020 20:28:24 +0000 Subject: [PATCH] arm builders: move buildvm-armv7-22/23/24 and buildvm-aarch64-22/23 over to buildvmhost-aarch64-17 and off the moonshot Signed-off-by: Kevin Fenzi --- inventory/builders | 5 ++--- inventory/host_vars/buildvm-aarch64-22.arm.fedoraproject.org | 2 +- inventory/host_vars/buildvm-aarch64-23.arm.fedoraproject.org | 2 +- inventory/host_vars/buildvm-armv7-22.arm.fedoraproject.org | 2 +- inventory/host_vars/buildvm-armv7-23.arm.fedoraproject.org | 2 +- inventory/host_vars/buildvm-armv7-24.arm.fedoraproject.org | 2 +- 6 files changed, 7 insertions(+), 8 deletions(-) diff --git a/inventory/builders b/inventory/builders index 9078fe8871..234a50fc7d 100644 --- a/inventory/builders +++ b/inventory/builders @@ -73,9 +73,8 @@ buildvm-aarch64-18.arm.fedoraproject.org buildvm-aarch64-19.arm.fedoraproject.org buildvm-aarch64-20.arm.fedoraproject.org buildvm-aarch64-21.arm.fedoraproject.org -# These two have been dropped to allow for osbs builders. -#buildvm-aarch64-22.arm.fedoraproject.org -#buildvm-aarch64-23.arm.fedoraproject.org +buildvm-aarch64-22.arm.fedoraproject.org +buildvm-aarch64-23.arm.fedoraproject.org buildvm-aarch64-24.arm.fedoraproject.org buildvm-aarch64-25.arm.fedoraproject.org diff --git a/inventory/host_vars/buildvm-aarch64-22.arm.fedoraproject.org b/inventory/host_vars/buildvm-aarch64-22.arm.fedoraproject.org index 7584287071..fce9785157 100644 --- a/inventory/host_vars/buildvm-aarch64-22.arm.fedoraproject.org +++ b/inventory/host_vars/buildvm-aarch64-22.arm.fedoraproject.org @@ -1,4 +1,4 @@ --- -vmhost: aarch64-c22n1.arm.fedoraproject.org +vmhost: buildvmhost-aarch64-17.arm.fedoraproject.org eth0_ip: 10.5.129.172 eth1_ip: 10.5.127.97 diff --git a/inventory/host_vars/buildvm-aarch64-23.arm.fedoraproject.org b/inventory/host_vars/buildvm-aarch64-23.arm.fedoraproject.org index 30c78c7c01..8b412fd2e9 100644 --- a/inventory/host_vars/buildvm-aarch64-23.arm.fedoraproject.org +++ b/inventory/host_vars/buildvm-aarch64-23.arm.fedoraproject.org @@ -1,4 +1,4 @@ --- -vmhost: aarch64-c23n1.arm.fedoraproject.org +vmhost: buildvmhost-aarch64-17.arm.fedoraproject.org eth0_ip: 10.5.129.173 eth1_ip: 10.5.127.98 diff --git a/inventory/host_vars/buildvm-armv7-22.arm.fedoraproject.org b/inventory/host_vars/buildvm-armv7-22.arm.fedoraproject.org index ce7c5ceb35..8a65a828b4 100644 --- a/inventory/host_vars/buildvm-armv7-22.arm.fedoraproject.org +++ b/inventory/host_vars/buildvm-armv7-22.arm.fedoraproject.org @@ -1,3 +1,3 @@ --- -vmhost: aarch64-c22n1.arm.fedoraproject.org +vmhost: buildvmhost-aarch64-17.arm.fedoraproject.org eth0_ip: 10.5.129.176 diff --git a/inventory/host_vars/buildvm-armv7-23.arm.fedoraproject.org b/inventory/host_vars/buildvm-armv7-23.arm.fedoraproject.org index ad8f634e6f..cb2ff304d4 100644 --- a/inventory/host_vars/buildvm-armv7-23.arm.fedoraproject.org +++ b/inventory/host_vars/buildvm-armv7-23.arm.fedoraproject.org @@ -1,3 +1,3 @@ --- -vmhost: aarch64-c23n1.arm.fedoraproject.org +vmhost: buildvmhost-aarch64-17.arm.fedoraproject.org eth0_ip: 10.5.129.177 diff --git a/inventory/host_vars/buildvm-armv7-24.arm.fedoraproject.org b/inventory/host_vars/buildvm-armv7-24.arm.fedoraproject.org index 05798cbae6..4ae33c1c15 100644 --- a/inventory/host_vars/buildvm-armv7-24.arm.fedoraproject.org +++ b/inventory/host_vars/buildvm-armv7-24.arm.fedoraproject.org @@ -1,3 +1,3 @@ --- -vmhost: aarch64-c24n1.arm.fedoraproject.org +vmhost: buildvmhost-aarch64-17.arm.fedoraproject.org eth0_ip: 10.5.129.178