openstack/tripleo-ci
Code Issues Proposed changes

upgrades job is renamed to updates

Browse Source 
We are renaming current ovb upgrades job to updates because it doesn't
upgrade OpenStack version.

The patch depends on a project-config change:
Icb9b5f403346b747c38ac33f3879cdcbf89c97ac that were discussed and
approved on the ML.

Change-Id: Ia43c870b73162d9d081a47f9a961ef69f7332cf3
Depends-On: Icb9b5f403346b747c38ac33f3879cdcbf89c97ac
This commit is contained in:
Emilien Macchi
2016-08-05 18:11:17 -04:00
parent 7251b90420
commit 4714322432
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
docs/wanted_ci_jobs.csv
View File

@@ -1,5 +1,5 @@
Job Name ,Pacemaker ,Reboot ,Upgrade ,NetIso V4 ,NetIso V6 ,Ceph Scale ,Swift Scale ,Block Scale ,External Ceph ,Ceph on Compute ,Cinder/RBD ,Nova/RBD ,Glance/RBD ,Cinder/NFS ,Glance/NFS ,Glance/Swift ,External LB ,Compute containers ,Public Endpoint TLS ,Internal services TLS Job Name ,Pacemaker ,Reboot ,Upgrade ,NetIso V4 ,NetIso V6 ,Ceph Scale ,Swift Scale ,Block Scale ,External Ceph ,Ceph on Compute ,Cinder/RBD ,Nova/RBD ,Glance/RBD ,Cinder/NFS ,Glance/NFS ,Glance/Swift ,External LB ,Compute containers ,Public Endpoint TLS ,Internal services TLS
centos-7-upgrades ,x , ,x , ,x ,x , , , , ,x ,x ,x , , , , , , , centos-7-updates ,x , ,x , ,x ,x , , , , ,x ,x ,x , , , , , , ,
centos-7-ha ,x ,o , ,x , , , , , , , , , , , ,x , , , , centos-7-ha ,x ,o , ,x , , , , , , , , , , , ,x , , , ,
centos-7-nonha , , , , , ,x , , , ,o ,x ,x ,x , , , , , ,x , centos-7-nonha , , , , , ,x , , , ,o ,x ,x ,x , , , , , ,x ,
centos-7-containers , , , , , , , , , , , , , , , ,x , ,x , , centos-7-containers , , , , , , , , , , , , , , , ,x , ,x , ,
1 Job Name Pacemaker Reboot Upgrade NetIso V4 NetIso V6 Ceph Scale Swift Scale Block Scale External Ceph Ceph on Compute Cinder/RBD Nova/RBD Glance/RBD Cinder/NFS Glance/NFS Glance/Swift External LB Compute containers Public Endpoint TLS Internal services TLS
2 centos-7-upgrades centos-7-updates x x x x x x x
3 centos-7-ha x o x x
4 centos-7-nonha x o x x x x
5 centos-7-containers x x

2
toci_gate_test.sh
View File

@@ -101,7 +101,7 @@ disown
# Switch defaults based on the job name # Switch defaults based on the job name
for JOB_TYPE_PART in $(sed 's/-/ /g' <<< "${TOCI_JOBTYPE:-}") ; do for JOB_TYPE_PART in $(sed 's/-/ /g' <<< "${TOCI_JOBTYPE:-}") ; do
case $JOB_TYPE_PART in case $JOB_TYPE_PART in
upgrades) updates)
NODECOUNT=3 NODECOUNT=3
OVERCLOUD_DEPLOY_ARGS="$OVERCLOUD_DEPLOY_ARGS -e /usr/share/openstack-tripleo-heat-templates/environments/puppet-pacemaker.yaml --ceph-storage-scale 1 -e /usr/share/openstack-tripleo-heat-templates/environments/network-isolation-v6.yaml -e /usr/share/openstack-tripleo-heat-templates/environments/net-multiple-nics-v6.yaml -e /opt/stack/new/tripleo-ci/test-environments/net-iso.yaml" OVERCLOUD_DEPLOY_ARGS="$OVERCLOUD_DEPLOY_ARGS -e /usr/share/openstack-tripleo-heat-templates/environments/puppet-pacemaker.yaml --ceph-storage-scale 1 -e /usr/share/openstack-tripleo-heat-templates/environments/network-isolation-v6.yaml -e /usr/share/openstack-tripleo-heat-templates/environments/net-multiple-nics-v6.yaml -e /opt/stack/new/tripleo-ci/test-environments/net-iso.yaml"
OVERCLOUD_UPDATE_ARGS="-e /usr/share/openstack-tripleo-heat-templates/overcloud-resource-registry-puppet.yaml $OVERCLOUD_DEPLOY_ARGS" OVERCLOUD_UPDATE_ARGS="-e /usr/share/openstack-tripleo-heat-templates/overcloud-resource-registry-puppet.yaml $OVERCLOUD_DEPLOY_ARGS"