summaryrefslogtreecommitdiffstats
path: root/docker
diff options
context:
space:
mode:
authorMorgan Richomme <morgan.richomme@orange.com>2016-01-19 11:48:39 +0100
committerJose Lausuch <jose.lausuch@ericsson.com>2016-01-19 14:18:10 +0000
commite6bcc951ad6ff395fa342f6cfec5729de7ac8c6c (patch)
treeb48af5163880b0d38699445e0e80bcddd13c78bc /docker
parent77e826cec8341e39ec7b92a32186b2e65bfc0fcf (diff)
Add mention to apache 2 license in Functest files and remove unused files
Change-Id: Iaf67792ad61351d0573c8d92e5d78f5f7a6e86ff Signed-off-by: Morgan Richomme <morgan.richomme@orange.com> (cherry picked from commit cc27777f84ea018cc2c0487a4fc3ff0c3b6d358f)
Diffstat (limited to 'docker')
-rw-r--r--docker/Dockerfile7
-rwxr-xr-xdocker/common.sh6
-rwxr-xr-xdocker/prepare_env.sh19
-rw-r--r--docker/requirements.pip9
-rwxr-xr-xdocker/run_tests.sh8
5 files changed, 47 insertions, 2 deletions
diff --git a/docker/Dockerfile b/docker/Dockerfile
index 0765eb848..3c5a2a657 100644
--- a/docker/Dockerfile
+++ b/docker/Dockerfile
@@ -17,7 +17,12 @@
#
# NOTE: providing config_functest.yaml is optional. If not provided, it will
# use the default one located in the repo
-
+#
+# 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
+#
FROM ubuntu:14.04
MAINTAINER Jose Lausuch <jose.lausuch@ericsson.com>
diff --git a/docker/common.sh b/docker/common.sh
index 1f1cc75df..c1c783983 100755
--- a/docker/common.sh
+++ b/docker/common.sh
@@ -23,6 +23,12 @@
# this pull is to be removed right before the B release, once we build
# a release candidate docker
+#
+# 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
+#
cd $repos_dir/functest
git pull
diff --git a/docker/prepare_env.sh b/docker/prepare_env.sh
index 48320d4cc..4f1751baa 100755
--- a/docker/prepare_env.sh
+++ b/docker/prepare_env.sh
@@ -6,6 +6,12 @@
# Installs the Functest framework within the Docker container
# and run the tests automatically
#
+#
+# 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
+#
usage="Script to prepare the Functest environment.
@@ -155,6 +161,19 @@ if [ $offline == false ]; then
git reset --hard ${PROMISE_COMMIT}
fi
+ info "Updating OVNO repository...."
+ cd ${OVNO_REPO_DIR}
+ if [ ${OVNO_BRANCH} != "master" ]; then
+ info "OVNO repo: checkout ${OVNO} branch..."
+ git checkout ${OVNO_BRANCH}
+ fi
+ info "OVNO repo: pulling to latest..."
+ git pull
+ if [ ${OVNO_COMMIT} != "latest" ]; then
+ info "OVNO repo: given commit is ${OVNO_COMMIT}. Reseting..."
+ git reset --hard ${OVNO_COMMIT}
+ fi
+
fi
# We do this regardless if its online or offline mode.
diff --git a/docker/requirements.pip b/docker/requirements.pip
index 8644154cf..40e56b9b5 100644
--- a/docker/requirements.pip
+++ b/docker/requirements.pip
@@ -1,3 +1,12 @@
+#
+#
+# author: Jose Lausuch (jose.lausuch@ericsson.com)
+#
+# 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
+#
pyyaml==3.10
gitpython==1.0.1
python-neutronclient==2.6.0
diff --git a/docker/run_tests.sh b/docker/run_tests.sh
index cb6fb0c80..54031ea9e 100755
--- a/docker/run_tests.sh
+++ b/docker/run_tests.sh
@@ -2,10 +2,16 @@
#
# Author: Jose Lausuch (jose.lausuch@ericsson.com)
-#
+# Morgan Richomme (morgan.richomme@orange.com)
# Installs the Functest framework within the Docker container
# and run the tests automatically
#
+#
+# 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
+#
usage="Script to trigger the tests automatically.