R3.0.3.x

.gitreview

@@ -13,4 +13,4 @@
 host=review.opencontrail.org
 port=29418
 project=Juniper/contrail-packaging.git
-defaultbranch=master
+defaultbranch=R3.0.3.x

build/build_docker_test_image.sh

@@ -0,0 +1,54 @@
+#!/bin/bash -x
+
+sku=$1
+shift
+to_build=${@:-'contrail-test-ci contrail-test'}
+VERSION=$(cat controller/src/base/version.info)
+TEST_ARTIFACT=${TEST_ARTIFACT:-$(readlink -f build/artifacts_extra/contrail-test-${VERSION}-*~$sku.tgz)}
+TEST_CI_ARTIFACT=${TEST_CI_ARTIFACT:-$(readlink -f build/artifacts_extra/contrail-test-ci-*~$sku.tgz)}
+FABRIC_UTILS_ARTIFACT=${FABRIC_UTILS_ARTIFACT:-$(readlink -f build/artifacts_extra/contrail-fabric-utils-*~$sku.tgz)}
+CONTRAIL_PACKAGE_DEB=${CONTRAIL_PACKAGE_DEB:-$(readlink -f build/artifacts/contrail-install-packages*~${sku}_all.deb)}
+DOCKER_IMAGE_EXPORT_PATH=${DOCKER_IMAGE_EXPORT_PATH:-$(readlink -f build/artifacts/)}
+#IPADDRESS=${IPADDRESS:-$(ip a show docker0 | awk '/inet / {split ($2,a,"/"); print a[1]}')}
+IPADDRESS="172.17.0.1"
+export SSHPASS=c0ntrail123
+
+clean_up() {
+    for j in `docker images| tr -s ' ' | cut -d ' ' -f3 | grep -v IMAGE`
+    do
+        docker rmi -f $j
+    done
+
+    for i in `docker ps -a | tr -s ' ' | cut -d ' ' -f1 | grep -v CONTAINER`
+    do
+        docker rm -f $i
+    done
+}
+
+tmp=$(mktemp -d)
+tar zxv -C $tmp -f $TEST_CI_ARTIFACT contrail-test-ci/install.sh
+
+for container in $to_build; do
+    echo "Building container for $container..."
+    tag=$(echo $container | sed -e 's/-/_/g')
+    bash -x $tmp/contrail-test-ci/install.sh docker-build --test-artifact $TEST_ARTIFACT \
+        --ci-artifact $TEST_CI_ARTIFACT --fab-artifact $FABRIC_UTILS_ARTIFACT \
+        -u ssh://${IPADDRESS}/${CONTRAIL_PACKAGE_DEB} --export $DOCKER_IMAGE_EXPORT_PATH $container
+    rc=$?
+    if [[ $rc = 0 ]]; then
+        touch ci_docker_build_${tag}_successful
+    else
+        echo "ERROR: Docker build for $container failed"
+        break
+    fi
+done
+
+clean_up
+rm -rf $tmp
+[[ $rc = 0 ]] && echo "Docker build completed!"
+set +e
+source /usr/local/jenkins/slave_scripts/ci-infra/ci-utils.sh
+DOCKER_IMAGE=$(ls build/artifacts/docker-image-contrail-test-*.gz 2>/dev/null)
+if [[ $? = 0 ]]; then
+    retry sshpass -p c0ntrail123 rsync -acz --no-owner --no-group $DOCKER_IMAGE ci-admin@10.84.26.50:$CI_IMAGE_DIR
+fi

build/deb_server_manager_setup.sh

@@ -25,6 +25,7 @@ NOWEBUI=""
 WEBCORE=""
 CERT_NAME=""
 SMLITE=""
+NOEXTERNALREPOS=""
 HOST_IP_LIST=`ifconfig | sed -n -e 's/:127\.0\.0\.1 //g' -e 's/ *inet addr:\([0-9.]\+\).*/\1/gp'`
 HOSTIP=`echo $HOST_IP_LIST | cut -d' ' -f1`
 rel=`lsb_release -r`
@@ -62,18 +63,9 @@ function cleanup_smgr_repos()
 
 }
 
-function setup_smgr_repos()
+function setup_apt_conf()
 {
-  # Push this to makefile - Copy only the file we need into installer.
-  if [ ${rel[1]} == "14.04"  ]; then
-    cp /opt/contrail/contrail_server_manager/ubuntu_14_04_1_sources.list /etc/apt/sources.list.d/smgr_sources.list
-  elif [ ${rel[1]} == "12.04"  ]; then
-    cp /opt/contrail/contrail_server_manager/ubuntu_12_04_3_sources.list /etc/apt/sources.list.d/smgr_sources.list
-  else
-    echo "$space$arrow This version of Ubuntu ${rel[1]} is not supported"
-    exit
-  fi
-
+  echo "$space$arrow Allow Install of Unauthenticated APT packages"
   # Allow unauthenticated pacakges to get installed.
   # Do not over-write apt.conf. Instead just append what is necessary
   # retaining other useful configurations such as http::proxy info.
@@ -86,24 +78,54 @@ function setup_smgr_repos()
     echo "$apt_auth" >> /etc/apt/apt.conf
   fi
 
-  echo "$space$arrow Setting up the repositories for Server Manager Install"
+  set +e
   apt-get update >> $log_file 2>&1
+  set -e
+}
+
 
-  echo "$space$arrow Installing dependent packages for Setting up repos"
+function setup_smgr_repos()
+{
+
+  echo "$space$arrow Installing dependent packages for Setting up Smgr repos"
   #scan pkgs in local repo and create Packages.gz
   apt-get --no-install-recommends -y install dpkg-dev >> $log_file 2>&1
-  # Dependencies to add apt-repos
-  apt-get --no-install-recommends -y install python-software-properties debmirror >> $log_file 2>&1
-  apt-get --no-install-recommends -y install software-properties-common >> $log_file 2>&1
 
   pushd /opt/contrail/contrail_server_manager >> $log_file 2>&1
   dpkg-scanpackages . | gzip -9c > Packages.gz | >> $log_file 2>&1
   popd >> $log_file 2>&1
- 
+
   echo "deb file:/opt/contrail/contrail_server_manager ./" > /tmp/local_repo
   cat /tmp/local_repo /etc/apt/sources.list.d/smgr_sources.list > /tmp/new_smgr_sources.list
   mv /tmp/new_smgr_sources.list /etc/apt/sources.list.d/smgr_sources.list
 
+  set +e
+  apt-get update >> $log_file 2>&1
+  set -e
+
+}
+
+function setup_internet_repos()
+{
+  echo "$space$arrow Setting up Internet Repos"
+  # Push this to makefile - Copy only the file we need into installer.
+  if [ ${rel[1]} == "14.04"  ]; then
+    cp /opt/contrail/contrail_server_manager/ubuntu_14_04_1_sources.list /etc/apt/sources.list.d/smgr_sources.list
+  elif [ ${rel[1]} == "12.04"  ]; then
+    cp /opt/contrail/contrail_server_manager/ubuntu_12_04_3_sources.list /etc/apt/sources.list.d/smgr_sources.list
+  else
+    echo "$space$arrow This version of Ubuntu ${rel[1]} is not supported"
+    exit
+  fi
+
+  set +e
+  apt-get update >> $log_file 2>&1
+  set -e
+
+  # Dependencies to add apt-repos
+  apt-get --no-install-recommends -y install python-software-properties debmirror >> $log_file 2>&1
+  apt-get --no-install-recommends -y install software-properties-common >> $log_file 2>&1
+
   puppet_list_file="/etc/apt/sources.list.d/puppet.list"
   passenger_list_file="/etc/apt/sources.list.d/passenger.list"
   dist='precise'
@@ -124,7 +146,7 @@ function setup_smgr_repos()
   fi
 
   # Repo to add for redis - required for contrail-web-core
-  add-apt-repository ppa:rwky/redis --yes >> $log_file 2>&1
+  #add-apt-repository ppa:rwky/redis --yes >> $log_file 2>&1
 
   # Cobbler repo to be added if this is not an SMLITE install
   if [ "$SMLITE" == "" ]; then
@@ -136,7 +158,10 @@ function setup_smgr_repos()
       add-apt-repository "deb http://download.opensuse.org/repositories/home:/libertas-ict:/cobbler26/xUbuntu_12.04/ ./" >> $log_file 2>&1
     fi
   fi
+
+  set +e
   apt-get update >> $log_file 2>&1
+  set -e
 
 }
 
@@ -199,11 +224,14 @@ while [ "$1" != "" ]; do
         --hostip)
             HOSTIP=$VALUE
             rm -rf /opt/contrail/contrail_server_manager/IP.txt
-            echo $HOSTIP >> /opt/contrail/contrail_server_manager/IP.txt 
+            echo $HOSTIP >> /opt/contrail/contrail_server_manager/IP.txt
             ;;
         --cert-name)
             CERT_NAME=$VALUE
             ;;
+        --no-external-repos)
+            NOEXTERNALREPOS="TRUE"
+            ;;
         *)
             echo "ERROR: unknown parameter \"$PARAM\""
             usage
@@ -214,8 +242,15 @@ while [ "$1" != "" ]; do
 done
 
 cleanup_smgr_repos
+setup_apt_conf
+if [ "$NOEXTERNALREPOS" == "" ]; then
+  setup_internet_repos
+else
+  touch /etc/apt/sources.list.d/smgr_sources.list
+fi
 setup_smgr_repos
 
+RESTART_SERVER_MANAGER=""
 if [ "$SM" != "" ]; then
   echo "$arrow Server Manager"
 
@@ -244,7 +279,7 @@ if [ "$SM" != "" ]; then
 
   #TODO: To be Removed after local repo additions
   if [ ${rel[1]} == "14.04"  ]; then
-    apt-get --no-install-recommends -y install libpython2.7=2.7.6-8ubuntu0.2 >> $log_file 2>&1
+    apt-get --no-install-recommends -y install libpython2.7>=2.7.6-8ubuntu0.2 >> $log_file 2>&1
   fi
   apt-get -y --force-yes -o Dpkg::Options::="--force-confdef" -o Dpkg::Options::="--force-confnew" install puppet-common="3.7.3-1puppetlabs1" puppetmaster-common="3.7.3-1puppetlabs1" >> $log_file 2>&1
   cp /opt/contrail/contrail_server_manager/puppet.conf /etc/puppet/
@@ -273,14 +308,11 @@ if [ "$SM" != "" ]; then
   if [ "$check_upgrade" != ""  ]; then
     # Upgrade
     echo "$space$arrow Upgrading Server Manager"
+    RESTART_SERVER_MANAGER="1"
     if [ "$SMLITE" != "" ]; then
        echo "$space$arrow$install_str Server Manager Lite"
        apt-get -y install contrail-server-manager-lite >> $log_file 2>&1
        apt-get -y install -f >> $log_file 2>&1
-       echo "$space$space$arrow Starting Server Manager Lite Service"
-       service contrail-server-manager restart
-       sleep 5
-       service contrail-server-manager status
     else
        cv=`cobbler --version`
        cv=( $cv  )
@@ -296,19 +328,18 @@ if [ "$SM" != "" ]; then
        apt-get -y install contrail-server-manager >> $log_file 2>&1
        apt-get -y install -f >> $log_file 2>&1
        # Stopping webui service that uses old name
-       old_webui_status=`service supervisor-webui status | awk '{print $2}' | cut -d'/' -f 1`
-       if [ $old_webui_status != "stop"  ]; then
-          service supervisor-webui stop >> $log_file 2>&1 # TODO : Remove for 3.0 release
+       if [ -f /etc/init.d/supervisor-webui ]; then
+         old_webui_status=`service supervisor-webui status | awk '{print $2}' | cut -d'/' -f 1`
+         if [ $old_webui_status != "stop"  ]; then
+            service supervisor-webui stop >> $log_file 2>&1 # TODO : Remove for 3.0 release
+         fi
        fi
     fi
   else
     if [ "$SMLITE" != "" ]; then
        echo "$space$arrow$install_str Server Manager Lite"
        apt-get -y install contrail-server-manager-lite >> $log_file 2>&1
-       echo "$space$space$arrow Starting Server Manager Lite Service"
-       service contrail-server-manager restart
-       sleep 5
-       service contrail-server-manager status
+       RESTART_SERVER_MANAGER="1"
     else
       echo "$space$arrow$install_str Server Manager"
       apt-get -y install cobbler="2.6.3-1" >> $log_file 2>&1 # TODO : Remove after local repo pinning
@@ -364,9 +395,19 @@ if [ "$SMMON" != "" ] && [ "$NOSMMON" == "" ]; then
   echo "$arrow Completed Installing Server Manager Monitoring"
 fi
 
+if [ "x$RESTART_SERVER_MANAGER" == "x1" ]; then
+  if [ "$SMLITE" != "" ]; then
+    echo "$space$space$arrow Starting Server Manager Lite Service"
+  else
+    echo "$space$space$arrow Starting Server Manager Service"
+  fi
+  service contrail-server-manager restart >> $log_file 2>&1
+  sleep 5
+fi
+
 # Should we remove Puppet/Passenger sources.list.d files also?
 echo "$arrow Reverting Repos to old state"
-rm -f /etc/apt/sources.list.d/puppet.list >> $log_file 2>&1 
+rm -f /etc/apt/sources.list.d/puppet.list >> $log_file 2>&1
 rm -f /etc/apt/sources.list.d/passenger.list >> $log_file 2>&1
 rm -f /etc/apt/sources.list.d/smgr_sources.list >> $log_file 2>&1
 apt-get update >> $log_file 2>&1

build/libs/packager/common.py

@@ -26,6 +26,7 @@ class MakeError(Exception):
 class BasePackager(Utils):
     ''' Base class for packager methods '''
     def __init__(self, **kwargs):
+        self.debug                 = kwargs.get('debug', True) # echo unfiltered exec_cmd() output
         self.base_pkg_files        = self.expanduser(kwargs['base_package_file'])
         self.depends_pkg_files     = self.expanduser(kwargs['depends_package_file'])
         self.contrail_pkg_files    = self.expanduser(kwargs['contrail_package_file'])

build/libs/packager/utils.py

@@ -96,7 +96,7 @@ def log_fds(self, fds):
         for fd in fds:
             out = self.read_async(fd)
             if out:
-                sys.stdout.write(out)
+                if getattr(self, 'debug', True): sys.stdout.write(out)
                 log.handlers[1].stream.write(out)
                 log.handlers[1].stream.flush()
 

build/package_configs/centos65/havana/depends_packages.cfg

@@ -1752,8 +1752,8 @@ file = ifmap-python-client-0.3.2-1407190101.el6.noarch.rpm
 md5  = d1a2256cc7c612e712f981087c28b4cf
 
 [ifmap-server]
-file = ifmap-server-0.3.2-2contrail.el6.noarch.rpm
-md5  = 512e5c97a0608de137fa6d2e550bd5ba
+file = ifmap-server-0.3.2-4contrail.el6.noarch.rpm
+md5  = a02bfbb7b83fa56ab8617fb7de3285ad
 package_type = contrail-install-packages, contrail-thirdparty-packages
 
 [authbind]

build/package_configs/centos65/icehouse/depends_packages.cfg

@@ -649,9 +649,9 @@ md5   = 48981e56ec5b1a0df6c6aa94454fb24c
 file  = ifmap-python-client-0.3.2-1407190101.el6.noarch.rpm
 md5   = d1a2256cc7c612e712f981087c28b4cf
 
-[ifmap-server_0.3.2_1408082330.el6]
-file  = ifmap-server-0.3.2-2contrail.el6.noarch.rpm
-md5   = 512e5c97a0608de137fa6d2e550bd5ba
+[ifmap-server-0.3.2-5contrail.el6]
+file  = ifmap-server-0.3.2-5contrail.el6.noarch.rpm
+md5   = 71f21bede135ab1fdd6b3936a5d676cf
 package_type = contrail-install-packages, contrail-thirdparty-packages
 
 [ipmitool_1.8.11_16.el6]

build/package_configs/centoslinux71/juno/contrail_packages.cfg

@@ -50,6 +50,10 @@ makeloc   = tools/packaging/common/rpm
 pkgs      = contrail-dns
 makeloc   = tools/packaging/common/rpm
 
+[contrail-database-common]
+pkgs      = contrail-database-common
+makeloc   = tools/packaging/common/rpm
+
 [contrail-interface-name]
 pkgs      = contrail-interface-name
 makeloc   = tools/packaging/common/rpm

build/package_configs/centoslinux71/juno/depends_contrail_dependent_packages.cfg

@@ -655,6 +655,26 @@ md5            = 75e5a5963d0c5bd58f1fcd9cb3646e06
 file           = kernel-tools-libs-3.10.0-229.el7.x86_64.rpm
 md5            = 46e28f051a08b8859c45306cdc57de3b
 
+[kernel-3.10.0-327.10.1.el7]
+file           = kernel-3.10.0-327.10.1.el7.x86_64.rpm
+md5            = f28fc700e3276f13b1e5fba4e5459793
+source         = repo:updates
+
+[kernel-headers-3.10.0-327.10.1.el7]
+file           = kernel-headers-3.10.0-327.10.1.el7.x86_64.rpm
+md5            = 598bbf7927e3e69c9dd6820e9b934815
+source         = repo:updates
+
+[kernel-tools-3.10.0-327.10.1.el7]
+file           = kernel-tools-3.10.0-327.10.1.el7.x86_64.rpm
+md5            = de120dc8ed401bc3c55d88c995552a86
+source         = repo:updates
+
+[kernel-tools-libs-3.10.0-327.10.1.el7]
+file           = kernel-tools-libs-3.10.0-327.10.1.el7.x86_64.rpm
+md5            = aaf83ada7c7504d8db4a9adbbc437db1
+source         = repo:updates
+
 [keyutils-1.5.8-3.el7]
 file           = keyutils-1.5.8-3.el7.x86_64.rpm
 md5            = 1332e9cc5a05ae8385311648957ddabe
@@ -1628,10 +1648,6 @@ md5            = e6eb2bb1e2a899c2a2f76308fd49ed15
 file           = python-futures-2.1.6-1.el7.noarch.rpm
 md5            = b4542b2f6aba78d6b8218c058458e396
 
-[python-gevent-1.0-2.el7]
-file           = python-gevent-1.0-2.el7.x86_64.rpm
-md5            = 15225ae038bd53b53e6ca73c520f82b8
-
 [python-greenlet-0.4.2-3.el7]
 file           = python-greenlet-0.4.2-3.el7.x86_64.rpm
 md5            = 953a467532eb12586f788eaeec60dd53

build/package_configs/centoslinux71/juno/depends_contrail_installer_packages.cfg

@@ -91,10 +91,11 @@ md5            = ccc1ca75c0a2e80434a5fd4610476a83
 file           = python-ecdsa-0.11-3.el7.centos.noarch.rpm
 md5            = d0e0370629d546b390ec258e12292147
 
-[python-Fabric-1.7.5-1.1contrail0]
-file           = python-Fabric-1.7.5-1.1contrail0.noarch.rpm
-md5            = e3a4b8cc6271229a76545645564dd4b5
+[python-Fabric-1.7.5-1.2contrail0]
+file           = python-Fabric-1.7.5-1.2contrail0.noarch.rpm
+md5            = 899afb211197ada80e326b6a86b53fc0
 source         = repo:contrail-thirdparty
+package_type   = contrail-install-packages, contrail-thirdparty-packages, contrail-installer-packages
 
 [python-netaddr-0.7.12-1.el7.centos]
 file           = python-netaddr-0.7.12-1.el7.centos.noarch.rpm