diff options
| author |   jose.lausuch <jose.lausuch@ericsson.com> | 2016-01-13 15:52:27 +0100 |
|---|---|---|
| committer | jose.lausuch <jose.lausuch@ericsson.com> | 2016-01-13 15:56:12 +0100 |
| commit | 48af5a794b5bbe9d6cb84f02c1e314dd83adf912 (patch) | |
| tree | a86b32adf3d80d2b06c3b6c7ee6467fa01eda70f | |
| parent | b5fbec071deb608cdba57fe1523ffc2505193249 (diff) | |
Change functest branch to stable/brahmaputra
JIRA: FUNCTEST-123
Although this is master, the idea is to run the tests using
brahmaputra branch. After brahmaputra, we will change this back
to master.
Change-Id: Ib67f090724ce733b05c37a69a746b879b1143776
Signed-off-by: jose.lausuch <jose.lausuch@ericsson.com>
| -rw-r--r-- | docker/Dockerfile | 2 | ||||
| -rwxr-xr-x | docker/prepare_env.sh | 4 | ||||
| -rw-r--r-- | testcases/config_functest.yaml | 2 |
3 files changed, 2 insertions, 6 deletions
diff --git a/docker/Dockerfile b/docker/Dockerfile index a39775c81..0d2cfb4f7 100644 --- a/docker/Dockerfile +++ b/docker/Dockerfile @@ -57,7 +57,7 @@ RUN mkdir -p /root/.ssh RUN chmod 700 /root/.ssh RUN git config --global http.sslVerify false -RUN git clone https://gerrit.opnfv.org/gerrit/functest ${repos_dir}/functest +RUN git clone -b stable/brahmaputra https://gerrit.opnfv.org/gerrit/functest ${repos_dir}/functest RUN git clone https://gerrit.opnfv.org/gerrit/releng ${repos_dir}/releng RUN git clone https://gerrit.opnfv.org/gerrit/doctor ${repos_dir}/doctor RUN git clone https://github.com/openstack/rally.git ${repos_dir}/rally diff --git a/docker/prepare_env.sh b/docker/prepare_env.sh index cf407499f..ec14391c0 100755 --- a/docker/prepare_env.sh +++ b/docker/prepare_env.sh @@ -82,10 +82,6 @@ if [ $offline == false ]; then # Update repos info "Updating Functest repository...." cd ${FUNCTEST_REPO_DIR} - if [ ${FUNCTEST_BRANCH} != "master" ]; then - info "Functest repo: checkout ${FUNCTEST_BRANCH} branch..." - git checkout ${FUNCTEST_BRANCH} - fi info "Functest repo: pulling to latest..." git pull if [ ${FUNCTEST_COMMIT} != "latest" ]; then diff --git a/testcases/config_functest.yaml b/testcases/config_functest.yaml index bca4f9dcd..5c457612d 100644 --- a/testcases/config_functest.yaml +++ b/testcases/config_functest.yaml @@ -27,7 +27,7 @@ general: repositories: # branch and commit ID to which the repos will be reset (HEAD) - functest_branch: master + functest_branch: stable/brahmaputra functest_commit: latest releng_branch: master releng_commit: latest |