aboutsummaryrefslogtreecommitdiffstats
path: root/build
diff options
context:
space:
mode:
Diffstat (limited to 'build')
-rw-r--r--build/build.conf33
-rw-r--r--build/os/centos/rhel6/base.repo52
-rw-r--r--build/os/centos/rhel7/juno/Dockerfile.tmpl3
-rw-r--r--build/os/ubuntu/trusty/juno/Dockerfile.tmpl3
-rw-r--r--build/os/ubuntu/trusty/kilo/Dockerfile.tmpl3
-rw-r--r--build/templates/RedHat_juno.tmpl1
6 files changed, 16 insertions, 79 deletions
diff --git a/build/build.conf b/build/build.conf
index cf44905f..d57e5f37 100644
--- a/build/build.conf
+++ b/build/build.conf
@@ -1,25 +1,24 @@
TIMEOUT=10
-PACKAGE_URL=${PACKAGE_URL:-http://58.251.166.184:9999}
+export PACKAGE_URL=${PACKAGE_URL:-http://58.251.166.184:9999}
#begin: package download
-PACKAGE_MD5=${PACKAGE_MD5:-$PACKAGE_URL/md5.txt}
-CENTOS_BASE=${CENTOS_BASE:-$PACKAGE_URL/centos_base.iso}
-COMPASS_CORE=${COMPASS_CORE:-http://github.com/baigk/compass-core.git}
-COMPASS_WEB=${COMPASS_WEB:-http://github.com/baigk/compass-web.git}
-COMPASS_INSTALL=${COMPASS_INSTALL:-http://github.com/baigk/compass-install.git}
-TRUSTY_JUNO_PPA=${TRUSTY_JUNO_PPA:-$PACKAGE_URL/trusty-juno-ppa.tar.gz}
-UBUNTU_ISO=${UBUNTU_ISO:-$PACKAGE_URL/ubuntu-14.04.3-server-amd64.iso}
-CENTOS_ISO=${CENTOS_ISO:-$PACKAGE_URL/CentOS-7-x86_64-Minimal-1503-01.iso}
-CENTOS7_JUNO_PPA=${CENTOS7_JUNO_PPA:-$PACKAGE_URL/centos7-juno-ppa.tar.gz}
-COMPASS_PKG=${COMPASS_PKG:-$PACKAGE_URL/centos6-package.tar.gz}
-LOADERS=${LOADERS:-$PACKAGE_URL/loaders.tar.gz}
-CIRROS=${CIRROS:-$PACKAGE_URL/cirros-0.3.3-x86_64-disk.img}
-APP_PACKAGE=${APP_PACKAGE:-$PACKAGE_URL/packages.tar.gz}
-PIP_REPO=${PIP_REPO:-$PACKAGE_URL/pip.tar.gz}
-ANSIBLE_MODULE=${ANSIBLE_MODULE:-https://github.com/openstack-ansible/openstack-ansible-modules.git}
+export CENTOS_BASE=${CENTOS_BASE:-$PACKAGE_URL/centos_base.iso}
+export COMPASS_CORE=${COMPASS_CORE:-http://github.com/baigk/compass-core.git}
+export COMPASS_WEB=${COMPASS_WEB:-http://github.com/baigk/compass-web.git}
+export COMPASS_INSTALL=${COMPASS_INSTALL:-http://github.com/baigk/compass-install.git}
+export TRUSTY_JUNO_PPA=${TRUSTY_JUNO_PPA:-$PACKAGE_URL/trusty-juno-ppa.tar.gz}
+export UBUNTU_ISO=${UBUNTU_ISO:-$PACKAGE_URL/ubuntu-14.04.3-server-amd64.iso}
+export CENTOS_ISO=${CENTOS_ISO:-$PACKAGE_URL/CentOS-7-x86_64-Minimal-1503-01.iso}
+export CENTOS7_JUNO_PPA=${CENTOS7_JUNO_PPA:-$PACKAGE_URL/centos7-juno-ppa.tar.gz}
+export COMPASS_PKG=${COMPASS_PKG:-$PACKAGE_URL/centos6-package.tar.gz}
+export LOADERS=${LOADERS:-$PACKAGE_URL/loaders.tar.gz}
+export CIRROS=${CIRROS:-$PACKAGE_URL/cirros-0.3.3-x86_64-disk.img}
+export APP_PACKAGE=${APP_PACKAGE:-$PACKAGE_URL/packages.tar.gz}
+export PIP_REPO=${PIP_REPO:-$PACKAGE_URL/pip.tar.gz}
+export ANSIBLE_MODULE=${ANSIBLE_MODULE:-https://github.com/openstack-ansible/openstack-ansible-modules.git}
#end
-PIP_CONF="https://bootstrap.pypa.io/ez_setup.py \
+export PIP_CONF="https://bootstrap.pypa.io/ez_setup.py \
https://pypi.python.org/packages/source/s/setuptools/setuptools-18.2.zip \
https://pypi.python.org/packages/source/p/pip/pip-7.1.2.tar.gz \
https://pypi.python.org/packages/source/a/ansible/ansible-1.9.2.tar.gz \
diff --git a/build/os/centos/rhel6/base.repo b/build/os/centos/rhel6/base.repo
deleted file mode 100644
index e1ea7c4b..00000000
--- a/build/os/centos/rhel6/base.repo
+++ /dev/null
@@ -1,52 +0,0 @@
-# CentOS-Base.repo
-#
-# The mirror system uses the connecting IP address of the client and the
-# update status of each mirror to pick mirrors that are updated to and
-# geographically close to the client. You should use this for CentOS updates
-# unless you are manually picking other mirrors.
-#
-# If the mirrorlist= does not work for you, as a fall back you can try the
-# remarked out baseurl= line instead.
-#
-#
-
-[base]
-name=CentOS-$releasever - Base - 163.com
-baseurl=http://mirrors.163.com/centos/$releasever/os/$basearch/
-#mirrorlist=http://mirrorlist.centos.org/?release=$releasever&arch=$basearch&repo=os
-gpgcheck=1
-gpgkey=http://mirror.centos.org/centos/RPM-GPG-KEY-CentOS-6
-
-#released updates
-[updates]
-name=CentOS-$releasever - Updates - 163.com
-baseurl=http://mirrors.163.com/centos/$releasever/updates/$basearch/
-#mirrorlist=http://mirrorlist.centos.org/?release=$releasever&arch=$basearch&repo=updates
-gpgcheck=1
-gpgkey=http://mirror.centos.org/centos/RPM-GPG-KEY-CentOS-6
-
-#additional packages that may be useful
-[extras]
-name=CentOS-$releasever - Extras - 163.com
-baseurl=http://mirrors.163.com/centos/$releasever/extras/$basearch/
-#mirrorlist=http://mirrorlist.centos.org/?release=$releasever&arch=$basearch&repo=extras
-gpgcheck=1
-gpgkey=http://mirror.centos.org/centos/RPM-GPG-KEY-CentOS-6
-
-#additional packages that extend functionality of existing packages
-[centosplus]
-name=CentOS-$releasever - Plus - 163.com
-baseurl=http://mirrors.163.com/centos/$releasever/centosplus/$basearch/
-#mirrorlist=http://mirrorlist.centos.org/?release=$releasever&arch=$basearch&repo=centosplus
-gpgcheck=1
-enabled=0
-gpgkey=http://mirror.centos.org/centos/RPM-GPG-KEY-CentOS-6
-
-#contrib - packages by Centos Users
-[contrib]
-name=CentOS-$releasever - Contrib - 163.com
-baseurl=http://mirrors.163.com/centos/$releasever/contrib/$basearch/
-#mirrorlist=http://mirrorlist.centos.org/?release=$releasever&arch=$basearch&repo=contrib
-gpgcheck=1
-enabled=0
-gpgkey=http://mirror.centos.org/centos/RPM-GPG-KEY-CentOS-6
diff --git a/build/os/centos/rhel7/juno/Dockerfile.tmpl b/build/os/centos/rhel7/juno/Dockerfile.tmpl
index 450e5c85..34945d00 100644
--- a/build/os/centos/rhel7/juno/Dockerfile.tmpl
+++ b/build/os/centos/rhel7/juno/Dockerfile.tmpl
@@ -1,9 +1,6 @@
FROM centos:7.1.1503
MAINTAINER Chigang(Justin) <chigang@huawei.com>
-# TODO: Is there some easy way to get the fastest/closest mirror?
-# RUN sed -i 's/archive.ubuntu.com/mirrors.163.com/g' /etc/apt/sources.list
-
# set cache enable
RUN sed -i 's/keepcache=0/keepcache=1/g' /etc/yum.conf
#set packages = $getVar('spcial_packages', [])
diff --git a/build/os/ubuntu/trusty/juno/Dockerfile.tmpl b/build/os/ubuntu/trusty/juno/Dockerfile.tmpl
index d723b6e7..2071cb41 100644
--- a/build/os/ubuntu/trusty/juno/Dockerfile.tmpl
+++ b/build/os/ubuntu/trusty/juno/Dockerfile.tmpl
@@ -1,9 +1,6 @@
FROM ubuntu:14.04.3
MAINTAINER Chigang(Justin) <chigang@huawei.com>
-# TODO: Is there some easy way to get the fastest/closest mirror?
-RUN sed -i 's/archive.ubuntu.com/mirrors.163.com/g' /etc/apt/sources.list
-
#RUN apt-get update
RUN rm -f /etc/apt/apt.conf.d/docker-clean
diff --git a/build/os/ubuntu/trusty/kilo/Dockerfile.tmpl b/build/os/ubuntu/trusty/kilo/Dockerfile.tmpl
index d723b6e7..2071cb41 100644
--- a/build/os/ubuntu/trusty/kilo/Dockerfile.tmpl
+++ b/build/os/ubuntu/trusty/kilo/Dockerfile.tmpl
@@ -1,9 +1,6 @@
FROM ubuntu:14.04.3
MAINTAINER Chigang(Justin) <chigang@huawei.com>
-# TODO: Is there some easy way to get the fastest/closest mirror?
-RUN sed -i 's/archive.ubuntu.com/mirrors.163.com/g' /etc/apt/sources.list
-
#RUN apt-get update
RUN rm -f /etc/apt/apt.conf.d/docker-clean
diff --git a/build/templates/RedHat_juno.tmpl b/build/templates/RedHat_juno.tmpl
index 6381ef8d..e8a54ac8 100644
--- a/build/templates/RedHat_juno.tmpl
+++ b/build/templates/RedHat_juno.tmpl
@@ -4,7 +4,6 @@ set -x
yum remove systemd -y
# add 163 repo
yum install wget -y
-#wget -O /etc/yum.repos.d/CentOS7-Base-163.repo http://mirrors.163.com/.help/CentOS7-Base-163.repo
wget -O /epel-release-7-5.noarch.rpm http://dl.fedoraproject.org/pub/epel/7/x86_64/e/epel-release-7-5.noarch.rpm
yum remove wget iptables-services -y
yum update -y