- job-template:
    name: 'cloud-mkcloud{version}-job-upgrade-disruptive-{arch}'
    node: cloud-trigger
    disabled: '{obj:disabled}'

    triggers:
      - timed: '32 22 * * *'

    logrotate:
      numToKeep: -1
      daysToKeep: 7

    builders:
      - trigger-builds:
        - project: openstack-mkcloud
          condition: SUCCESS
          block: true
          current-parameters: true
          predefined-parameters: |
            TESTHEAD=1
            cloudsource=develcloud{previous_version}
            upgrade_cloudsource=develcloud{version}
            nodenumber=3
            cephvolumenumber=2
            storage_method=swift
            mkcloudtarget=plain_with_upgrade testsetup
            want_nodesupgrade=1
            label={label}
            job_name=cloud-mkcloud{version}-job-upgrade-disruptive-{arch}

- job-template:
    name: 'cloud-mkcloud{version}-job-upgrade-disruptive-{arch}'
    node: cloud-trigger
    disabled: '{obj:disabled}'

    triggers:
      - timed: '32 22 * * *'

    logrotate:
      numToKeep: -1
      daysToKeep: 7

    builders:
      - trigger-builds:
        - project: openstack-mkcloud
          condition: SUCCESS
          block: true
          current-parameters: true
          predefined-parameters: |
            TESTHEAD=1
            cloudsource=develcloud{previous_version}
            upgrade_cloudsource=develcloud{version}
            nodenumber=4
            cephvolumenumber=2
            storage_method=swift
            mkcloudtarget=plain_with_upgrade testsetup
            want_nodesupgrade=1
            label={label}
            job_name=cloud-mkcloud{version}-job-upgrade-disruptive-{arch}

Raise the nodenumber so the default swift replica count is correct
Raise the nodenumber so the default swift replica count is correct

It seems that due to a very old version of swift in cloud6
we cannot change the default number of replicas so it will
always default to 3. Using a nodenumber count of 3 makes the
default number of nodes assigned to the swift-storage role to be
2 which doesnt sync with the required number of replicas, causing
the upgrade prechecks to fail.
Setting the nodenumber to 4 makes the default number of swift-storage
nodes to be 3, making the upgrade prechecks pass.
