upstream-ecs-3.2.0.1 (#427)

* add patch for ECS CE 3.2.0.1
* bump patch version for ECS 3.2.0.1
* update user release.conf
* udpate Jenkins config to pull from cache box
* update jenkins-ecsce-template to CentOS 7.5

Jenkinsfile

@@ -10,7 +10,7 @@ pipeline {
     parameters {
         string(name: 'vsphere_server', defaultValue: '10.1.83.17', description: 'vSphere host')
         string(name: 'datastore', defaultValue: 'iSCSI-2', description: 'vSphere datastore')
-        string(name: 'template', defaultValue: 'jenkins/ecsce-template', description: 'VM template')
+        string(name: 'template', defaultValue: 'jenkins/jenkins-ecsce-template', description: 'VM template')
         string(name: 'resource_pool', defaultValue: 'Cisco UCS Cluster/Resources/Tests', description: 'vSphere resource pool')
         string(name: 'datacenter', defaultValue: 'Datacenter', description: 'vSphere datacenter')
         string(name: 'network_interface', defaultValue: 'CI Network', description: 'CI network interface')

patches/3.2.0.1/.dockerignore

@@ -0,0 +1,3 @@
+nile-object-reduced.txz
+build.sh
+image.conf

patches/3.2.0.1/Dockerfile

@@ -0,0 +1,30 @@
+# Fixes to the default 3.2.0.1 reduced image.
+
+# Build on object-reduced image (GA release)
+FROM emcvipr/object:3.2.0.1-101633.6533e6c-reduced
+
+# Increase memory for transformsvc
+RUN sed -i s/Xmx128m/Xmx512m/ /opt/storageos/bin/transformsvc
+
+# Set memory for objcontrolsvc
+RUN sed -i s/Xmx96m/Xmx256m/ /opt/storageos/bin/objcontrolsvc
+
+# Fix disk partitioning script
+RUN sed -i '/VMware/ s/$/ \&\& [ ! -e \/data\/is_community_edition ]/' /opt/storageos/bin/storageserver-partition-config.sh
+
+RUN /usr/bin/chmod +x /opt/storageos/bin/storageserver-partition-config.sh
+
+# Set VNest useSeperateThreadPools to True
+RUN f=/opt/storageos/conf/vnest-common-conf.xml; grep -q "object.UseSeparateThreadPools" $f || sed -i '/properties id="serviceProperties"/a \ \ \ \ \ \ \ \ <prop key="object.UseSeparateThreadPools">true</prop>' $f
+
+# Set georeceiver's initialBufferNumOnHeap to something smaller for CE
+RUN f=/opt/storageos/conf/georeceiver-conf.xml; grep -q 'name="initialBufferNumOnHeap" value="5"' $f ||  sed -i 's/name="initialBufferNumOnHeap" value="60"/name="initialBufferNumOnHeap" value="5"/' $f
+
+RUN f=/opt/storageos/conf/georeceiver-conf.xml; grep -q '<prop key="object.InitialBufferNumOnHeap">10</prop>' $f || sed -i 's#<prop key="object.InitialBufferNumOnHeap">80</prop>#<prop key="object.InitialBufferNumOnHeap">10</prop>#g' $f
+
+# Configure CM Object properties: Disable minimum storage device count
+RUN f=/opt/storageos/conf/cm.object.properties; grep -q 'MustHaveEnoughResources=false' $f ||  sed -i 's/MustHaveEnoughResources=true/MustHaveEnoughResources=false/' $f
+
+# Allow allocation of different blocks of a chunk to be stored on the same partition
+RUN f=/opt/storageos/conf/ssm-cf-conf.xml; grep -q '<config:boolean name="allowAllocationOnIgnoredPartitions" value="true" description="If set to true, different blocks in one chunk may be allocated on the same partition"/>' $f || sed -i 's#<config:boolean name="allowAllocationOnIgnoredPartitions" value="false" description="If set to true, different blocks in one chunk may be allocated on the same partition"/>#<config:boolean name="allowAllocationOnIgnoredPartitions" value="true" description="If set to true, different blocks in one chunk may be allocated on the same partition"/>#g' /opt/storageos/conf/ssm-cf-conf.xml $f
+

patches/3.2.0.1/build.sh

@@ -0,0 +1,4 @@
+#!/usr/bin/env bash
+source image.conf
+
+docker build -t "${IMAGE_REPO}:${IMAGE_VERSION}" .

patches/3.2.0.1/image.conf

@@ -0,0 +1,3 @@
+BASE_IMAGE="emcvipr/object:3.2.0.1-101633.6533e6c-reduced"
+IMAGE_REPO="emccorp/ecs-software-3.2.0"
+IMAGE_VERSION="3.2.0.1"

release.conf

@@ -11,6 +11,12 @@
 # DO NOT specify an alternate registry here. Use the -r argument to
 # bootstrap.sh for that.
 #
+### Older versions ( 3.2 )
+# release_artifact="emccorp/ecs-software-3.2.0"
+# release_tag="3.2.0.1"
+# release_tag="3.2.0.0"
+# release_tag="latest"
+#
 ### Older versions ( 3.1 )
 # release_artifact="emccorp/ecs-software-3.1.0"
 # release_tag="3.1.0.0"

tests/ansible/roles/install_node/tasks/main.yml

@@ -27,8 +27,19 @@
     owner: root
     group: root
 
+- name: Configure /etc/resolve.conf
+
+
+- name: Fetch the docker registry certificate
+  get_url:
+    url: http://10.1.83.5/registry.crt
+    dest: /root/ecs/registry.crt
+    owner: root
+    group: root
+    mode: 0600
+
 - name: Run boostrap script
-  shell: /root/ecs/bootstrap.sh -n --build-from http://10.1.83.5/alpine --vm-tools --proxy-cert /root/ecs/contrib/sslproxycert/emc_ssl.pem --proxy-endpoint 10.1.83.5:3128 -c /root/ecs/deploy.yml --centos-mirror 10.1.83.5
+  shell: /root/ecs/bootstrap.sh -n --override-dns 10.1.83.5 --build-from http://cache.gotham.local/alpine --vm-tools --proxy-cert /root/ecs/contrib/sslproxycert/emc_ssl.pem --proxy-endpoint cache.gotham.local:3128 -c /root/ecs/deploy.yml --centos-mirror cache.gotham.local --registry-endpoint cache.gotham.local:5000 --registry-cert /root/ecs/registry.crt
 
 - name: reboot nodes
   shell: sleep 2 && shutdown -r now "Ansible reboot"

ui/etc/config.yml

@@ -13,7 +13,7 @@
 ---
 ui:
   name: ECS Community Edition Install Node
-  version: 2.7.1
+  version: 2.7.2
   host_root_dir: /opt/emc/ecs-install
   state_file: /opt/state.yml
   deploy_file: /opt/deploy.yml
@@ -32,7 +32,7 @@ ui:
   ffx_sem: /opt/ffx.sem
 product:
   name: ECS
-  version: 3.2.0.0
+  version: 3.2.0.1
   vendor: Dell EMC
   flavor: Community Edition
   slogan: Free and Frictionless

ui/etc/release.conf

@@ -8,10 +8,10 @@
 # it is provided by or on behalf of EMC.
 
 release_name="ECS Community Edition"
-release_version="3.2.0.0"
+release_version="3.2.0.1"
 release_product="ECS Software"
 release_artifact="emccorp/ecs-software-3.2.0"
-release_tag="3.2.0.0"
+release_tag="3.2.0.1"
 release_common_name="emccorp/ecs-software:latest"
 
 docker_host_root="/opt/emc/ecs-install"
@@ -33,7 +33,7 @@ image_name='ecs-install'
 tag='latest'
 ver_maj='2'
 ver_min='7'
-ver_rev='1'
+ver_rev='2'
 ver_tag='r'
 serial=0
 

ui/setup.py

@@ -3,7 +3,7 @@
 
 setup(
     name='ecsdeploy',
-    version='2.7.1',
+    version='2.7.2',
     packages=find_packages(),
     scripts=['ui.py',
              'ecsdeploy.py',