diff options
| author |   rexlee8776 <limingjiang@huawei.com> | 2019-04-15 06:41:19 +0000 |
|---|---|---|
| committer | rexlee8776 <limingjiang@huawei.com> | 2019-04-15 06:41:19 +0000 |
| commit | e6d688c6585e976010dc9c5b3a051613171a8ddc (patch) | |
| tree | f407b75ba130fa60623d3c989ca569e6a7731391 /docker | |
| parent | 441c147b14aae5ed6181d024b6f9ff370d9286c3 (diff) | |
[bugfix] docker build failed in hunter due to storperf version
storperf do not have hunter branch, so it need to be set
as stable/gambia
JIRA: YARDSTICK-1610
Change-Id: I818396c46ce165019159b9852abb02f176507ac0
Signed-off-by: rexlee8776 <limingjiang@huawei.com>
Diffstat (limited to 'docker')
| -rw-r--r-- | docker/Dockerfile | 2 | ||||
| -rw-r--r-- | docker/Dockerfile.aarch64.patch | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/docker/Dockerfile b/docker/Dockerfile index 29319e056..31f7d5dfc 100644 --- a/docker/Dockerfile +++ b/docker/Dockerfile @@ -38,7 +38,7 @@ RUN git clone --depth 1 -b $BRANCH https://gerrit.opnfv.org/gerrit/yardstick ${Y #RUN mkdir ${YARDSTICK_REPO_DIR} #COPY ./ ${YARDSTICK_REPO_DIR} RUN git clone --depth 1 https://gerrit.opnfv.org/gerrit/releng ${RELENG_REPO_DIR} -RUN git clone --depth 1 -b $BRANCH https://gerrit.opnfv.org/gerrit/storperf ${STORPERF_REPO_DIR} +RUN git clone --depth 1 -b stable/gambia https://gerrit.opnfv.org/gerrit/storperf ${STORPERF_REPO_DIR} RUN ansible-playbook -i ${YARDSTICK_REPO_DIR}/ansible/install-inventory.ini -c local -vvv -e INSTALLATION_MODE="container" ${YARDSTICK_REPO_DIR}/ansible/install.yaml diff --git a/docker/Dockerfile.aarch64.patch b/docker/Dockerfile.aarch64.patch index cae9dbb2f..2f510b841 100644 --- a/docker/Dockerfile.aarch64.patch +++ b/docker/Dockerfile.aarch64.patch @@ -35,7 +35,7 @@ index 71ce6b58..fce7c116 100644 @@ -40,7 +41,8 @@ RUN git clone --depth 1 -b $BRANCH https://gerrit.opnfv.org/gerrit/yardstick ${Y RUN git clone --depth 1 https://gerrit.opnfv.org/gerrit/releng ${RELENG_REPO_DIR} - RUN git clone --depth 1 -b $BRANCH https://gerrit.opnfv.org/gerrit/storperf ${STORPERF_REPO_DIR} + RUN git clone --depth 1 -b stable/gambia https://gerrit.opnfv.org/gerrit/storperf ${STORPERF_REPO_DIR} -RUN ansible-playbook -i ${YARDSTICK_REPO_DIR}/ansible/install-inventory.ini -c local -vvv -e INSTALLATION_MODE="container" ${YARDSTICK_REPO_DIR}/ansible/install.yaml +RUN sed -i -e '/configure_gui/d' ${YARDSTICK_REPO_DIR}/ansible/install.yaml && \ |