From 08ae976de1bd8e25ecdfaf3d63ae15423c145d8b Mon Sep 17 00:00:00 2001 From: Will Holland Date: Thu, 15 Oct 2015 16:55:58 +0100 Subject: Change trove --- builder_logic.py | 4 ++-- get_definitions.sh | 5 +++-- triggers/firehose_trigger.sh | 5 ++--- triggers/testing_trigger.sh | 2 +- ybd.conf | 8 ++++---- 5 files changed, 12 insertions(+), 12 deletions(-) diff --git a/builder_logic.py b/builder_logic.py index 7a4f248..dc5c4f0 100644 --- a/builder_logic.py +++ b/builder_logic.py @@ -6,8 +6,8 @@ BUILD_SCRIPT = 'build_a_system.sh' DEPLOY_SCRIPT = 'deploy_a_system.sh' DEFINITIONS_DIR='definitions' DEFAULT_REF = "cu010-trove/br6/firehose-test-1" -TESTING_REPO = 'ssh://git@cu010-trove.codethink.com/cu010-trove/br6/ciat-tester' -BUILDSLAVE_SCRIPTS_REPO = 'ssh://git@cu010-trove.codethink.com/cu010-trove/br6/buildslave-scripts' +TESTING_REPO = 'ssh://git@git.baserock.org/baserock/ciat/ciat-tester' +BUILDSLAVE_SCRIPTS_REPO = 'ssh://git@git.baserock.org/baserock/ciat/buildslave-scripts' whitelist = [ DEFAULT_SYSTEM, diff --git a/get_definitions.sh b/get_definitions.sh index 63b5921..1733b42 100644 --- a/get_definitions.sh +++ b/get_definitions.sh @@ -1,8 +1,9 @@ #!/bin/sh set -ex +SHA="$1" if [ -d definitions ]; then sudo rm -rf definitions fi -git clone --no-checkout ssh://git@cu010-trove.codethink.com/baserock/baserock/definitions.git +git clone --no-checkout ssh://git@git.baserock.org/baserock/baserock/definitions.git cd definitions -git checkout "$1" +git checkout "$SHA" diff --git a/triggers/firehose_trigger.sh b/triggers/firehose_trigger.sh index 80ee3fd..d7e9e1b 100644 --- a/triggers/firehose_trigger.sh +++ b/triggers/firehose_trigger.sh @@ -13,7 +13,7 @@ if [ -d src/morph ]; then rm -rf src/morph fi # Install firehose -git clone -b cu010-trove/br6/williamholland ssh://git@cu010-trove.codethink.com/baserock/baserock/firehose.git ./src/firehose +git clone -b cu010-trove/br6/williamholland ssh://git@git.baserock.org/baserock/baserock/firehose.git ./src/firehose git clone -b baserock/morph git://git.baserock.org/delta/cliapp.git ./src/cliapp git clone -n git://git.baserock.org/baserock/baserock/morph.git ./src/morph git --git-dir=./src/morph/.git --work-tree=./src/morph checkout 519a6460930c5ae08a9591035f72e88fd4db9b71 @@ -35,8 +35,7 @@ fi ../../../bin/pip install fs pylru install -D -m644 /dev/stdin ~/.morph.conf <<'EOF' [config] -trove-id = cu010-trove -trove-host = cu010-trove.codethink.com +trove-host = git.baserock.org EOF SLAVEBIN="$(pwd)/bin" PATH="$PATH:$SLAVEBIN" diff --git a/triggers/testing_trigger.sh b/triggers/testing_trigger.sh index 98b5088..2eb895f 100644 --- a/triggers/testing_trigger.sh +++ b/triggers/testing_trigger.sh @@ -18,7 +18,7 @@ cd /archive/testing if [ -d ciat-tester ]; then sudo rm -rf ciat-tester fi -git clone git://cu010-trove.codethink.com/cu010-trove/br6/ciat-tester.git +git clone git://git.baserock.org/baserock/ciat/ciat-tester.git cd ciat-tester if [ "$TESTING_SHA" != "no_testing_sha_given" ]; then git checkout $TESTING_SHA diff --git a/ybd.conf b/ybd.conf index 1047528..3fb308c 100644 --- a/ybd.conf +++ b/ybd.conf @@ -1,19 +1,19 @@ aliases: - 'baserock:': 'git://cu010-trove.codethink.com/baserock/' + 'baserock:': 'git://git.baserock.org/baserock/' 'freedesktop:': 'git://anongit.freedesktop.org/' 'github:': 'git://github.com/' 'gnome:': 'git://git.gnome.org/' - 'upstream:': 'git://cu010-trove.codethink.com/delta/' + 'upstream:': 'git://git.baserock.org/delta/' base-path: ['/usr/bin', '/bin', '/usr/sbin', '/sbin'] base: '/src' defaults: 'config/defaults.conf' defs-schema: './schema/definitions-schema.json' -git-server: 'http://cu010-trove.codethink.com:8080/1.0/sha1s?' +git-server: 'http://git.baserock.org:8080/1.0/sha1s?' json-schema: './schema/json-schema.json' kbas-url: 'http://ciat.baserock.org:8001' kbas-password: 'mostdefinatelyinsecure' no-ccache: False no-distcc: True serve-artifacts: True -tar-url: 'http://cu010-trove.codethink.com/tarballs' +tar-url: 'http://git.baserock.org/tarballs' instances: 5 -- cgit v1.2.1