From 7ba76747d55669e2bbaf70a3061e1c0b5dea912e Mon Sep 17 00:00:00 2001
From: MatthewLi <matthew.lijun@huawei.com>
Date: Thu, 24 Mar 2016 22:59:42 -0400
Subject: rubbos docker ci running improvement

JIRA: BOTTLENECK-48

Change-Id: Ic27b7b203b58cfc2cee6bda20391edb8966566b2
Signed-off-by: MatthewLi <matthew.lijun@huawei.com>
---
 ci/docker/Dockerfile                | 43 +++++++++++++++++++++++++++++++++++++
 ci/docker/bottlenecks-ci/Dockerfile | 43 -------------------------------------
 2 files changed, 43 insertions(+), 43 deletions(-)
 create mode 100644 ci/docker/Dockerfile
 delete mode 100644 ci/docker/bottlenecks-ci/Dockerfile

(limited to 'ci/docker')

diff --git a/ci/docker/Dockerfile b/ci/docker/Dockerfile
new file mode 100644
index 00000000..bb6d64ef
--- /dev/null
+++ b/ci/docker/Dockerfile
@@ -0,0 +1,43 @@
+##############################################################################
+# Copyright (c) 2015 Huawei Technologies Co.,Ltd and others.
+#
+# 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 Qi Liang <liangqi1@huawei.com>
+
+LABEL image=opnfv/bottlenecks
+
+# GIT repo directory
+ENV REPOS_DIR /home/opnfv
+
+# Bottlenecks repo
+ENV BOTTLENECKS_REPO_DIR ${REPOS_DIR}/bottlenecks
+ENV RELENG_REPO_DIR ${REPOS_DIR}/releng
+
+RUN apt-get update && apt-get install -y \
+    curl \
+    wget \
+    git \
+    sshpass \
+    python \
+    python-glanceclient \
+    python-heatclient \
+    python-keystoneclient \
+    python-neutronclient \
+    python-novaclient
+
+RUN apt-get -y autoremove && \
+    apt-get clean
+
+RUN mkdir -p ${REPOS_DIR}
+
+RUN git config --global http.sslVerify false
+# TODO fix code clone handler
+#RUN git clone https://gerrit.opnfv.org/gerrit/bottlenecks ${BOTTLENECKS_REPO_DIR}
+#RUN git clone https://gerrit.opnfv.org/gerrit/releng ${RELENG_REPO_DIR}
+
diff --git a/ci/docker/bottlenecks-ci/Dockerfile b/ci/docker/bottlenecks-ci/Dockerfile
deleted file mode 100644
index 7e543886..00000000
--- a/ci/docker/bottlenecks-ci/Dockerfile
+++ /dev/null
@@ -1,43 +0,0 @@
-##############################################################################
-# Copyright (c) 2015 Huawei Technologies Co.,Ltd and others.
-#
-# 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 Qi Liang <liangqi1@huawei.com>
-
-LABEL image=opnfv/bottlenecks
-
-# GIT repo directory
-ENV REPOS_DIR /home/opnfv/repos
-
-# Bottlenecks repo
-ENV BOTTLENECKS_REPO_DIR ${REPOS_DIR}/bottlenecks
-ENV RELENG_REPO_DIR ${REPOS_DIR}/releng
-
-RUN apt-get update && apt-get install -y \
-    curl \
-    wget \
-    git \
-    sshpass \
-    python \
-    python-glanceclient \
-    python-heatclient \
-    python-keystoneclient \
-    python-neutronclient \
-    python-novaclient
-
-RUN apt-get -y autoremove && \
-    apt-get clean
-
-RUN mkdir -p ${REPOS_DIR}
-
-RUN git config --global http.sslVerify false
-# TODO fix code clone handler
-#RUN git clone https://gerrit.opnfv.org/gerrit/bottlenecks ${BOTTLENECKS_REPO_DIR}
-#RUN git clone https://gerrit.opnfv.org/gerrit/releng ${RELENG_REPO_DIR}
-
-- 
cgit 1.2.3-korg