From: Carlos Goncalves Date: Fri, 29 Jan 2016 11:11:13 +0000 (+0000) Subject: Merge "tests: fix inject_failure() for deployment built by apex" X-Git-Tag: colorado.1.0~87 X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=commitdiff_plain;h=c643a5ad3d608aa8abad8c1e4442ad98310fc43b;p=doctor.git Merge "tests: fix inject_failure() for deployment built by apex" --- c643a5ad3d608aa8abad8c1e4442ad98310fc43b diff --cc tests/run.sh index c7956ea2,b3560f5c..7bb0da28 --- a/tests/run.sh +++ b/tests/run.sh @@@ -1,16 -1,19 +1,13 @@@ #!/bin/bash -ex +############################################################################## +# Copyright (c) 2016 NEC Corporation and others. # -# Copyright 2016 NEC Corporation. -# -# Licensed under the Apache License, Version 2.0 (the "License"); you may -# not use this file except in compliance with the License. You may obtain -# a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT -# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the -# License for the specific language governing permissions and limitations -# under the License. +# All rights reserved. This program and the accompanying materials +# are made available under the terms of the Apache License, Version 2.0 +# which accompanies this distribution, and is available at +# http://www.apache.org/licenses/LICENSE-2.0 +############################################################################## - #branch=$(git rev-parse --abbrev-ref HEAD) - BRANCH=master - IMAGE_URL=https://launchpad.net/cirros/trunk/0.3.0/+download/cirros-0.3.0-x86_64-disk.img IMAGE_NAME=cirros IMAGE_FILE="${IMAGE_NAME}.img"