diff --git a/Jenkinsfile b/Jenkinsfile index 90531c98..c3ff88a7 100644 --- a/Jenkinsfile +++ b/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') diff --git a/patches/3.2.0.1/.dockerignore b/patches/3.2.0.1/.dockerignore new file mode 100644 index 00000000..07563641 --- /dev/null +++ b/patches/3.2.0.1/.dockerignore @@ -0,0 +1,3 @@ +nile-object-reduced.txz +build.sh +image.conf diff --git a/patches/3.2.0.1/Dockerfile b/patches/3.2.0.1/Dockerfile new file mode 100644 index 00000000..63bc7684 --- /dev/null +++ b/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 \ \ \ \ \ \ \ \ true' $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 '10' $f || sed -i 's#80#10#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 '' $f || sed -i 's###g' /opt/storageos/conf/ssm-cf-conf.xml $f + diff --git a/patches/3.2.0.1/build.sh b/patches/3.2.0.1/build.sh new file mode 100644 index 00000000..8bfdd7b9 --- /dev/null +++ b/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}" . diff --git a/patches/3.2.0.1/image.conf b/patches/3.2.0.1/image.conf new file mode 100644 index 00000000..8d466e16 --- /dev/null +++ b/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" diff --git a/release.conf b/release.conf index 2cfb0998..feb45409 100644 --- a/release.conf +++ b/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" diff --git a/tests/ansible/roles/install_node/tasks/main.yml b/tests/ansible/roles/install_node/tasks/main.yml index 8b8db467..60ed365c 100644 --- a/tests/ansible/roles/install_node/tasks/main.yml +++ b/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" diff --git a/ui/etc/config.yml b/ui/etc/config.yml index 00b69b02..1e993333 100644 --- a/ui/etc/config.yml +++ b/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 diff --git a/ui/etc/release.conf b/ui/etc/release.conf index 8506d56b..aa696bb9 100644 --- a/ui/etc/release.conf +++ b/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 diff --git a/ui/setup.py b/ui/setup.py index 9742f434..353a7c7c 100755 --- a/ui/setup.py +++ b/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',