From 783240ce14579394859096b92269ea73cb449252 Mon Sep 17 00:00:00 2001 From: Sam Thursfield Date: Fri, 20 Oct 2017 13:05:55 +0100 Subject: Remove Mason definitions --- baserock_mason_x86_32/distbuild.conf | 19 ------------------- baserock_mason_x86_32/mason-x86-32.morph | 26 -------------------------- baserock_mason_x86_32/mason.conf | 18 ------------------ baserock_mason_x86_64/distbuild.conf | 19 ------------------- baserock_mason_x86_64/mason-x86-64.morph | 27 --------------------------- baserock_mason_x86_64/mason.conf | 18 ------------------ 6 files changed, 127 deletions(-) delete mode 100644 baserock_mason_x86_32/distbuild.conf delete mode 100644 baserock_mason_x86_32/mason-x86-32.morph delete mode 100644 baserock_mason_x86_32/mason.conf delete mode 100644 baserock_mason_x86_64/distbuild.conf delete mode 100644 baserock_mason_x86_64/mason-x86-64.morph delete mode 100644 baserock_mason_x86_64/mason.conf diff --git a/baserock_mason_x86_32/distbuild.conf b/baserock_mason_x86_32/distbuild.conf deleted file mode 100644 index 2b344783..00000000 --- a/baserock_mason_x86_32/distbuild.conf +++ /dev/null @@ -1,19 +0,0 @@ -# This machine is not allowed to make outgoing network connections outside -# the local network, so it cannot use DNS. You must use IP addresses instead -# of hostnames in this file. - -CONTROLLERHOST: mason-x86-32 - -# This is the IP of cache.baserock.org. Note that the shared-artifact-cache -# secgroup only allows write access with this local IP. -ARTIFACT_CACHE_SERVER: 192.168.222.14 - -DISTBUILD_CONTROLLER: true -DISTBUILD_WORKER: true - -TROVE_HOST: git.baserock.org -TROVE_ID: baserock -WORKERS: mason-x86-32 - -# Do not change the following -WORKER_SSH_KEY: /etc/distbuild/worker.key diff --git a/baserock_mason_x86_32/mason-x86-32.morph b/baserock_mason_x86_32/mason-x86-32.morph deleted file mode 100644 index ceeb66da..00000000 --- a/baserock_mason_x86_32/mason-x86-32.morph +++ /dev/null @@ -1,26 +0,0 @@ -name: mason-x86-32 -kind: cluster -description: | - Generic x86_32 Mason image. -systems: -- morph: systems/build-system-x86_32.morph - deploy: - mason: - upgrade-type: extensions/ssh-rsync - upgrade-location: root@192.168.222.81 - - type: openstack - location: https://compute.datacentred.io:5000/v2.0 - CLOUD_INIT: true - DISK_SIZE: 3G - DISTBUILD_GENERIC: true - INSTALL_FILES: install-files/distbuild/manifest - KERNEL_ARGS: console=ttyS0 console=tty0 - MASON_GENERIC: true - OPENSTACK_IMAGENAME: baserock_mason_x86_32 - # Note that this *must* match the name of the instance, as - # cloud-init will override this hostname. - HOSTNAME: mason-x86-32 - # Set a hosts entry for git.baserock.org. It will be - # only possible to reach it using the internal IP - HOSTS_gbo: 192.168.222.58 git.baserock.org diff --git a/baserock_mason_x86_32/mason.conf b/baserock_mason_x86_32/mason.conf deleted file mode 100644 index 83625415..00000000 --- a/baserock_mason_x86_32/mason.conf +++ /dev/null @@ -1,18 +0,0 @@ -# This machine is not allowed to make outgoing network connections outside -# the local network, so it cannot use DNS. You must use IP addresses instead -# of hostnames in this file. - -# This is the IP of cache.baserock.org. Note that the shared-artifact-cache -# secgroup only allows write access with this local IP. -ARTIFACT_CACHE_SERVER: 192.168.222.14 - -MASON_CLUSTER_MORPHOLOGY: clusters/ci.morph -MASON_DEFINITIONS_REF: master -MASON_DISTBUILD_ARCH: x86_32 -MASON_TEST_HOST: None - -TROVE_HOST: git.baserock.org -TROVE_ID: baserock - -CONTROLLERHOST: mason-x86-32 -TEST_INFRASTRUCTURE_TYPE: none diff --git a/baserock_mason_x86_64/distbuild.conf b/baserock_mason_x86_64/distbuild.conf deleted file mode 100644 index b184e16b..00000000 --- a/baserock_mason_x86_64/distbuild.conf +++ /dev/null @@ -1,19 +0,0 @@ -# This machine is not allowed to make outgoing network connections outside -# the local network, so it cannot use DNS. You must use IP addresses instead -# of hostnames in this file. - -CONTROLLERHOST: mason-x86-64 - -# This is the IP of cache.baserock.org. Note that the shared-artifact-cache -# secgroup only allows write access with this local IP. -ARTIFACT_CACHE_SERVER: 192.168.222.14 - -DISTBUILD_CONTROLLER: true -DISTBUILD_WORKER: true - -TROVE_HOST: git.baserock.org -TROVE_ID: baserock -WORKERS: mason-x86-64 - -# Do not change the following -WORKER_SSH_KEY: /etc/distbuild/worker.key diff --git a/baserock_mason_x86_64/mason-x86-64.morph b/baserock_mason_x86_64/mason-x86-64.morph deleted file mode 100644 index 7717f03d..00000000 --- a/baserock_mason_x86_64/mason-x86-64.morph +++ /dev/null @@ -1,27 +0,0 @@ -name: mason-x86-64 -kind: cluster -description: | - Generic x86_64 Mason image. -systems: -- morph: systems/build-system-x86_64.morph - deploy: - mason: - type: extensions/openstack - location: https://compute.datacentred.io:5000/v2.0 - - upgrade-type: extensions/ssh-rsync - upgrade-location: root@192.168.222.80 - - CLOUD_INIT: true - DISK_SIZE: 3G - DISTBUILD_GENERIC: true - INSTALL_FILES: install-files/distbuild/manifest - KERNEL_ARGS: console=ttyS0 console=tty0 - MASON_GENERIC: true - OPENSTACK_IMAGENAME: baserock_mason_x86_64 - # Note that this *must* match the name of the instance, as - # cloud-init will override this hostname. - HOSTNAME: mason-x86-64 - # Set a hosts entry for git.baserock.org. It will be - # only possible to reach it using the internal IP - HOSTS_gbo: 192.168.222.58 git.baserock.org diff --git a/baserock_mason_x86_64/mason.conf b/baserock_mason_x86_64/mason.conf deleted file mode 100644 index 4532720f..00000000 --- a/baserock_mason_x86_64/mason.conf +++ /dev/null @@ -1,18 +0,0 @@ -# This machine is not allowed to make outgoing network connections outside -# the local network, so it cannot use DNS. You must use IP addresses instead -# of hostnames in this file. - -# This is the IP of cache.baserock.org. Note that the shared-artifact-cache -# secgroup only allows write access with this local IP. -ARTIFACT_CACHE_SERVER: 192.168.222.14 - -MASON_CLUSTER_MORPHOLOGY: clusters/ci.morph -MASON_DEFINITIONS_REF: master -MASON_DISTBUILD_ARCH: x86_64 -MASON_TEST_HOST: None - -TROVE_HOST: git.baserock.org -TROVE_ID: baserock - -CONTROLLERHOST: mason-x86-64 -TEST_INFRASTRUCTURE_TYPE: none -- cgit v1.2.1