From 1c1234ec1b3f1cf277a67e54239c84b03e1cf324 Mon Sep 17 00:00:00 2001 From: Federico Ressi Date: Tue, 25 Jun 2019 12:35:29 +0200 Subject: [PATCH] Add tobiko-fixture CLI wrapper to CI tools Change-Id: Ic56585cd05271488e8fba61871e792ea6ebd3914 --- tools/ci/{lib => activate} | 0 tools/ci/fixture | 18 ++++++++++++++++++ tools/ci/os | 3 ++- tools/ci/tox | 2 +- 4 files changed, 21 insertions(+), 2 deletions(-) rename tools/ci/{lib => activate} (100%) create mode 100755 tools/ci/fixture diff --git a/tools/ci/lib b/tools/ci/activate similarity index 100% rename from tools/ci/lib rename to tools/ci/activate diff --git a/tools/ci/fixture b/tools/ci/fixture new file mode 100755 index 000000000..977b6f433 --- /dev/null +++ b/tools/ci/fixture @@ -0,0 +1,18 @@ +#!/bin/bash + +set -eu + +source $(dirname "$0")/activate +source $(dirname "$0")/os + + +function fixture { + os_setup + + tobiko-fixture "$@" +} + + +if [ $(basename "$0") == fixture ]; then + fixture "$@" +fi diff --git a/tools/ci/os b/tools/ci/os index b9c7e76ee..b977b79aa 100755 --- a/tools/ci/os +++ b/tools/ci/os @@ -2,7 +2,8 @@ set -eu -source $(dirname "$0")/lib +source $(dirname "$0")/activate + OS_VIRTUAL_ENV=$(realpath "${OS_VIRTUAL_ENV:-.tox/scenario}") diff --git a/tools/ci/tox b/tools/ci/tox index c7141d01f..91b5e1acc 100755 --- a/tools/ci/tox +++ b/tools/ci/tox @@ -2,7 +2,7 @@ set -eu -source $(dirname "$0")/lib +source $(dirname "$0")/activate # Prefer python 3 over python 2