aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorbaigk <baiguoku@huawei.com>2016-02-14 23:42:36 +0800
committerJustin chi <chigang@huawei.com>2016-03-14 08:01:47 +0000
commit5d782101be072c1459b2f384eb634e8857e2cd8a (patch)
treea51fc57244222127541e02b03bf8f937c1c6ef32
parentd79338373f2706485e5e8f14d80af08bfad9f208 (diff)
support to make liberty ppa of centos
JIRA: COMPASS-310 Change-Id: I9689ffed010a39c4a9dee6895e834f3ad58ab964 Signed-off-by: baigk <baiguoku@huawei.com> (cherry picked from commit b91704aa1eb8f3ee3cb0d6acab70ececdf361172)
-rwxr-xr-xbuild.sh6
-rw-r--r--build/build.conf1
-rw-r--r--build/gen_ins_pkg_script.py3
-rw-r--r--build/os/centos/rhel7/liberty/Dockerfile.tmpl27
4 files changed, 36 insertions, 1 deletions
diff --git a/build.sh b/build.sh
index d3a4ced..77a3b72 100755
--- a/build.sh
+++ b/build.sh
@@ -79,7 +79,7 @@ function download_local()
function download_packages()
{
for i in $CENTOS_BASE $COMPASS_CORE $COMPASS_WEB $COMPASS_INSTALL $TRUSTY_JUNO_PPA $TRUSTY_LIBERTY_PPA $UBUNTU_ISO \
- $CENTOS_ISO $CENTOS7_JUNO_PPA $CENTOS7_KILO_PPA $LOADERS $CIRROS $APP_PACKAGE $COMPASS_PKG \
+ $CENTOS_ISO $CENTOS7_JUNO_PPA $CENTOS7_KILO_PPA $CENTOS7_LIBERTY_PPA $LOADERS $CIRROS $APP_PACKAGE $COMPASS_PKG \
$PIP_REPO $ANSIBLE_MODULE; do
if [[ ! $i ]]; then
@@ -132,6 +132,10 @@ function copy_file()
cp $CACHE_DIR/`basename $CENTOS7_KILO_PPA` $new/repos/cobbler/centos/ppa/ -rf
fi
+ if [[ $CENTOS7_LIBERTY_PPA ]]; then
+ cp $CACHE_DIR/`basename $CENTOS7_LIBERTY_PPA` $new/repos/cobbler/centos/ppa/ -rf
+ fi
+
cp $CACHE_DIR/`basename $LOADERS` $new/ -rf || exit 1
cp $CACHE_DIR/`basename $APP_PACKAGE` $new/app_packages/ -rf || exit 1
cp $CACHE_DIR/`basename $ANSIBLE_MODULE | sed 's/.git//g'` $new/ansible/ -rf || exit 1
diff --git a/build/build.conf b/build/build.conf
index bc81764..b73de20 100644
--- a/build/build.conf
+++ b/build/build.conf
@@ -25,6 +25,7 @@ export UBUNTU_ISO=${UBUNTU_ISO:-$PACKAGE_URL/ubuntu-14.04.3-server-amd64.iso}
export TRUSTY_LIBERTY_PPA=${TRUSTY_LIBERTY_PPA:-$PACKAGE_URL/trusty-liberty-ppa.tar.gz}
#export CENTOS7_JUNO_PPA=${CENTOS7_JUNO_PPA:-$PACKAGE_URL/centos7-juno-ppa.tar.gz}
#export CENTOS7_KILO_PPA=${CENTOS7_KILO_PPA:-$PACKAGE_URL/centos7-kilo-ppa.tar.gz}
+#export CENTOS7_LIBERTY_PPA=${CENTOS7_LIBERTY_PPA:-$PACKAGE_URL/centos7-liberty-ppa.tar.gz}
# SDN Packages for integration
export APP_PACKAGE=${APP_PACKAGE:-$PACKAGE_URL/packages.tar.gz}
diff --git a/build/gen_ins_pkg_script.py b/build/gen_ins_pkg_script.py
index ec04c51..ef62bcd 100644
--- a/build/gen_ins_pkg_script.py
+++ b/build/gen_ins_pkg_script.py
@@ -19,6 +19,9 @@ def get_packages_name_list(file_list, special_packages):
for file in file_list:
datas = yaml.load(open(file))
+ if not datas:
+ continue
+
for key, value in datas.items():
if key == "pip_packages":
continue
diff --git a/build/os/centos/rhel7/liberty/Dockerfile.tmpl b/build/os/centos/rhel7/liberty/Dockerfile.tmpl
new file mode 100644
index 0000000..adb930f
--- /dev/null
+++ b/build/os/centos/rhel7/liberty/Dockerfile.tmpl
@@ -0,0 +1,27 @@
+FROM centos:7.1.1503
+MAINTAINER Chigang(Justin) <chigang@huawei.com>
+
+# set cache enable
+RUN sed -i 's/keepcache=0/keepcache=1/g' /etc/yum.conf
+#set packages = $getVar('spcial_packages', [])
+#for package in $packages
+ADD ./RedHat/packages/redhat_packages/$package /var/cache/yum/x86_64/7/base/packages/
+#end for
+#set scripts = $getVar('scripts', [])
+#for script in $scripts
+ADD ./RedHat/script/$script /tmp/chigang/$script
+RUN chmod +x /tmp/chigang/$script
+RUN /tmp/chigang/$script
+#end for
+ADD ./comps.xml /
+ADD ./ceph_key_release.asc /
+ADD ./install_packages.sh /tmp/chigang/install_packages.sh
+RUN chmod +x /tmp/chigang/install_packages.sh
+RUN /tmp/chigang/install_packages.sh
+
+ADD ./cp_repo.sh /tmp/chigang/cp_repo.sh
+RUN chmod +x /tmp/chigang/cp_repo.sh
+RUN mkdir /result
+
+CMD ["/tmp/chigang/cp_repo.sh"]
+#VOLUME /tmp/chigang