improve the efficiency of centos ppa building

JIRA: COMPASS-188

Change-Id: I8fbf89a71bee7a5e68976892ae8cd0bffc96c1ae
Signed-off-by: carey.xu <carey.xuhan@huawei.com>

diff --git a/build/build.conf b/build/build.conf
index c72451e..de50c40 100644 (file)
--- a/build/build.conf
+++ b/build/build.conf
@@ -74,5 +74,5 @@ export PIP_CONF="https://bootstrap.pypa.io/ez_setup.py \
     https://pypi.python.org/packages/source/M/MarkupSafe/MarkupSafe-0.23.tar.gz \
     https://pypi.python.org/packages/source/l/lazypy/lazypy-0.5.tar.gz \
     https://pypi.python.org/packages/source/p/pycrypto-on-pypi/pycrypto-on-pypi-2.3.tar.gz \
-    https://pypi.python.org/packages/2.6/p/pymongo/pymongo-3.0.3-cp26-none-macosx_10_10_intel.whl \
+    https://pypi.python.org/packages/source/p/pymongo/pymongo-3.0.3.tar.gz \
     https://pypi.python.org/packages/source/c/crudini/crudini-0.7.tar.gz"

diff --git a/build/templates/RedHat_juno.tmpl b/build/templates/RedHat_juno.tmpl
index e8a54ac..60a03b9 100644 (file)
--- a/build/templates/RedHat_juno.tmpl
+++ b/build/templates/RedHat_juno.tmpl
@@ -18,6 +18,7 @@ yum install http://rdo.fedorapeople.org/openstack-juno/rdo-release-juno.rpm -y
 # modify centos7 repo for workaround
 sed -i 's/epel-Derived from Red Hat Enterprise Linux 7.1 (Source)/epel-7/g' /etc/yum.repos.d/rdo-release.repo
 
+
 # add galeracluster repo
 cat <<EOF >/etc/yum.repos.d/MariaDB.repo
 [mariadb]
@@ -57,19 +58,20 @@ type=rpm-md
 gpgkey=https://ceph.com/git/?p=ceph.git;a=blob_plain;f=keys/release.asc
 EOF
 
+cat <<EOF >>/etc/yum.conf
+exclude=mongodb-org,mongodb-org-server
+EOF
+
 yum update -y
-yum install createrepo -y
-yum install tar -y
+yum install createrepo tar -y
 
+yum -y install --downloadonly MariaDB-Galera-server
 #download packages
 #set packages = $getVar('default_packages', [])
-#for pkg in $packages
-yum -y install $pkg --downloadonly
-#end for
+yum -y install --skip-broken --downloadonly #echo ' '.join(packages)
 #set packages = $getVar('packages', [])
-#for pkg in $packages
-yum -y install $pkg --downloadonly
-#end for
+#silent packages.pop(packages.index('MariaDB-Galera-server'))
+yum -y install --skip-broken --downloadonly #echo ' '.join(packages)
 
 #make repo
 

diff --git a/build/templates/RedHat_kilo.tmpl b/build/templates/RedHat_kilo.tmpl
index 3d58725..826acb8 100644 (file)
--- a/build/templates/RedHat_kilo.tmpl
+++ b/build/templates/RedHat_kilo.tmpl
@@ -64,19 +64,20 @@ baseurl=http://downloads-distro.mongodb.org/repo/redhat/os/x86_64
 gpgcheck=0
 EOF
 
+cat <<EOF >>/etc/yum.conf
+exclude=mongodb-org,mongodb-org-server
+EOF
+
 yum update -y
-yum install createrepo -y
-yum install tar -y
+yum install createrepo tar -y
 
+yum -y install --downloadonly MariaDB-Galera-server
 #download packages
 #set packages = $getVar('default_packages', [])
-#for pkg in $packages
-yum -y install $pkg --downloadonly
-#end for
+yum -y install --skip-broken --downloadonly #echo ' '.join(packages)
 #set packages = $getVar('packages', [])
-#for pkg in $packages
-yum -y install $pkg --downloadonly
-#end for
+#silent packages.pop(packages.index('MariaDB-Galera-server'))
+yum -y install --skip-broken --downloadonly #echo ' '.join(packages)
 
 #make repo
 

diff --git a/build/templates/RedHat_liberty.tmpl b/build/templates/RedHat_liberty.tmpl
index 8473f07..2946943 100644 (file)
--- a/build/templates/RedHat_liberty.tmpl
+++ b/build/templates/RedHat_liberty.tmpl
@@ -53,16 +53,20 @@ type=rpm-md
 gpgkey=https://ceph.com/git/?p=ceph.git;a=blob_plain;f=keys/release.asc
 EOF
 
+cat <<EOF >>/etc/yum.conf
+exclude=mongodb-org,mongodb-org-server
+EOF
+
 yum update -y
 yum install createrepo tar -y
 
 yum -y install --downloadonly MariaDB-Galera-server
 #download packages
 #set packages = $getVar('default_packages', [])
-yum -y install --downloadonly #echo ' '.join(packages)
+yum -y install --skip-broken --downloadonly #echo ' '.join(packages)
 #set packages = $getVar('packages', [])
 #silent packages.pop(packages.index('MariaDB-Galera-server'))
-yum -y install --downloadonly #echo ' '.join(packages)
+yum -y install --skip-broken --downloadonly #echo ' '.join(packages)
 
 #make repo
 mkdir -p /centos7-liberty-ppa/{Packages,repodata}