From b44a7efa27dbbe92cc208dc90243c24bb751e805 Mon Sep 17 00:00:00 2001 From: "James E. Blair" Date: Tue, 24 Jan 2017 13:45:50 -0800 Subject: [PATCH] Rename nodepool integration script We no longer expect this script to run the test, but rather, just setup the host. Rename it accordingly. Also, remove the temporary sleep and log cat as the job now does something useful. Change-Id: I0236d36b0c531777e61422de4273c5e8fb33323a Depends-On: I12143ac0841e5fc646448eae4171594579fa0086 --- tools/nodepool-integration-setup.sh | 12 ++++++++++++ tools/nodepool-integration-test.sh | 23 ----------------------- 2 files changed, 12 insertions(+), 23 deletions(-) create mode 100755 tools/nodepool-integration-setup.sh delete mode 100755 tools/nodepool-integration-test.sh diff --git a/tools/nodepool-integration-setup.sh b/tools/nodepool-integration-setup.sh new file mode 100755 index 0000000000..c02a0167a7 --- /dev/null +++ b/tools/nodepool-integration-setup.sh @@ -0,0 +1,12 @@ +#!/bin/bash -xe + +/usr/zuul-env/bin/zuul-cloner --workspace /tmp --cache-dir /opt/git \ + git://git.openstack.org openstack-infra/nodepool + +ln -s /tmp/nodepool/log $WORKSPACE/logs + +cd /tmp/openstack-infra/nodepool +/usr/local/jenkins/slave_scripts/install-distro-packages.sh +sudo pip install . + +bash -xe ./tools/zuul-nodepool-integration/start.sh diff --git a/tools/nodepool-integration-test.sh b/tools/nodepool-integration-test.sh deleted file mode 100755 index 74c2a01f66..0000000000 --- a/tools/nodepool-integration-test.sh +++ /dev/null @@ -1,23 +0,0 @@ -#!/bin/bash -xe - -/usr/zuul-env/bin/zuul-cloner --cache-dir /opt/git git://git.openstack.org \ - openstack-infra/nodepool - -cd openstack-infra/nodepool -/usr/local/jenkins/slave_scripts/install-distro-packages.sh -sudo pip install . - -cd $WORKSPACE - -cd openstack-infra/zuul -/usr/local/jenkins/slave_scripts/install-distro-packages.sh -sudo pip install . - -cd $WORKSPACE - -bash -xe openstack-infra/nodepool/tools/zuul-nodepool-integration/start.sh - -# TODO(jeblair): something useful and save logs -sleep 30 -cat /tmp/nodepool/log/nodepool-builder.log -cat /tmp/nodepool/log/nodepool-launcher.log