diff --git a/gerritbot/channels.yaml b/gerritbot/channels.yaml index 15a326d817..125e304864 100755 --- a/gerritbot/channels.yaml +++ b/gerritbot/channels.yaml @@ -2015,7 +2015,6 @@ openstack-qa: - master - stable/mitaka - stable/liberty - - stable/kilo openstack-quota: events: diff --git a/jenkins/jobs/devstack-gate.yaml b/jenkins/jobs/devstack-gate.yaml index 0315ab10b3..062e907d68 100644 --- a/jenkins/jobs/devstack-gate.yaml +++ b/jenkins/jobs/devstack-gate.yaml @@ -2010,12 +2010,7 @@ export PYTHONUNBUFFERED=true export DEVSTACK_GATE_TEMPEST=1 export DEVSTACK_GATE_TEMPEST_REGEX="database" - if [[ "stable/kilo" =~ $ZUUL_BRANCH ]]; then - # Trove was moved out of DevStack as plugin after Kilo - export DEVSTACK_GATE_TROVE=1 - else - export DEVSTACK_LOCAL_CONFIG="enable_plugin trove git://git.openstack.org/openstack/trove" - fi + export DEVSTACK_LOCAL_CONFIG="enable_plugin trove git://git.openstack.org/openstack/trove" # use tempest plugin (copied from ironic.yaml) if [[ "$ZUUL_BRANCH" != "master" ]] ; then diff --git a/jenkins/jobs/ironic.yaml b/jenkins/jobs/ironic.yaml index 9b92c31247..23f5256a66 100644 --- a/jenkins/jobs/ironic.yaml +++ b/jenkins/jobs/ironic.yaml @@ -67,30 +67,23 @@ - ironic-extra-vars: script: | export DEVSTACK_LOCAL_CONFIG+=$'\n'"IRONIC_DEPLOY_DRIVER_ISCSI_WITH_IPA=True" - # Support for non-CoreOS IPA ramdisks was added in Mitaka - if [ "$ZUUL_BRANCH" != "stable/liberty" ] ; then - # Standardize VM size for each supported ramdisk - case "{ramdisk-type}" in - 'tinyipa') - export DEVSTACK_LOCAL_CONFIG+=$'\n'"IRONIC_VM_SPECS_RAM=384" - export DEVSTACK_LOCAL_CONFIG+=$'\n'"IRONIC_RAMDISK_TYPE=tinyipa" - ;; - 'tinyipa256') - export DEVSTACK_LOCAL_CONFIG+=$'\n'"IRONIC_VM_SPECS_RAM=256" - export DEVSTACK_LOCAL_CONFIG+=$'\n'"IRONIC_RAMDISK_TYPE=tinyipa" - ;; - 'coreos') - export DEVSTACK_LOCAL_CONFIG+=$'\n'"IRONIC_VM_SPECS_RAM=1280" - export DEVSTACK_LOCAL_CONFIG+=$'\n'"IRONIC_RAMDISK_TYPE=coreos" - ;; - # if using a ramdisk without a known good value, use the devstack - # default by not exporting any value for IRONIC_VM_SPECS_RAM - esac - else - # For kilo and liberty, we still need 1280mb of ram as - # we only have the CoreOS ramdisk. - export DEVSTACK_LOCAL_CONFIG+=$'\n'"IRONIC_VM_SPECS_RAM=1280" - fi + # Standardize VM size for each supported ramdisk + case "{ramdisk-type}" in + 'tinyipa') + export DEVSTACK_LOCAL_CONFIG+=$'\n'"IRONIC_VM_SPECS_RAM=384" + export DEVSTACK_LOCAL_CONFIG+=$'\n'"IRONIC_RAMDISK_TYPE=tinyipa" + ;; + 'tinyipa256') + export DEVSTACK_LOCAL_CONFIG+=$'\n'"IRONIC_VM_SPECS_RAM=256" + export DEVSTACK_LOCAL_CONFIG+=$'\n'"IRONIC_RAMDISK_TYPE=tinyipa" + ;; + 'coreos') + export DEVSTACK_LOCAL_CONFIG+=$'\n'"IRONIC_VM_SPECS_RAM=1280" + export DEVSTACK_LOCAL_CONFIG+=$'\n'"IRONIC_RAMDISK_TYPE=coreos" + ;; + # if using a ramdisk without a known good value, use the devstack + # default by not exporting any value for IRONIC_VM_SPECS_RAM + esac - builder: name: ironic-ipxe-disabled diff --git a/jenkins/jobs/nodepool.yaml b/jenkins/jobs/nodepool.yaml index 271298a03b..c473059b37 100644 --- a/jenkins/jobs/nodepool.yaml +++ b/jenkins/jobs/nodepool.yaml @@ -24,10 +24,6 @@ # Override so we get a bare minimum set of base compute services # required to have nodepool function. OVERRIDE_ENABLED_SERVICES=dstat,g-api,g-reg,key,mysql,n-api,n-cond,n-cpu,n-crt,n-sch,q-agt,q-dhcp,q-l3,q-meta,q-metering,q-svc,rabbit,s-account,s-container,s-object,s-proxy - # n-obj has been removed from mitaka - if [[ "stable/kilo stable/liberty" =~ $ZUUL_BRANCH ]]; then - OVERRIDE_ENABLED_SERVICES+=,n-obj, - fi export OVERRIDE_ENABLED_SERVICES export BRANCH_OVERRIDE={branch-override} if [ "$BRANCH_OVERRIDE" != "default" ] ; then @@ -80,10 +76,6 @@ # Override so we get a bare minimum set of base compute services # required to have nodepool function. OVERRIDE_ENABLED_SERVICES=dstat,g-api,g-reg,key,mysql,n-api,n-cond,n-cpu,n-crt,n-sch,q-agt,q-dhcp,q-l3,q-meta,q-metering,q-svc,rabbit,s-account,s-container,s-object,s-proxy - # n-obj has been removed from mitaka - if [[ "stable/kilo stable/liberty" =~ $ZUUL_BRANCH ]]; then - OVERRIDE_ENABLED_SERVICES+=,n-obj, - fi export OVERRIDE_ENABLED_SERVICES export BRANCH_OVERRIDE={branch-override} if [ "$BRANCH_OVERRIDE" != "default" ] ; then diff --git a/zuul/layout.yaml b/zuul/layout.yaml index a3689901bf..50b0cdd54c 100755 --- a/zuul/layout.yaml +++ b/zuul/layout.yaml @@ -1813,13 +1813,13 @@ jobs: branch: ^(stable/(liberty|mitaka|newton)|master)$ - name: ^gate-requirements-tox-validate-ubuntu-xenial$ - branch: ^(?!stable/(kilo|liberty|mitaka)).*$ + branch: ^(?!stable/mitaka).*$ - name: ^gate-requirements-tox-validate-projects-ubuntu-xenial$ branch: master - name: gate-requirements-tox-babel-ubuntu-xenial - branch: ^(?!stable/(?:kilo|liberty|mitaka)).*$ + branch: ^(?!stable/mitaka).*$ files: - '^babel-test/.*' - '^tox.ini' @@ -2417,10 +2417,11 @@ jobs: - name: ^gate-.*-tox-checklang.*ubuntu-xenial$ # run this on all branches. The default ubuntu-xenial condition - # will not run this on older branches. We do not have a kilo - # branch but this allows to match all branches. + # will not run this on older branches. We do not have a + # thisbranchnamewillneverexist branch but this allows to match all + # branches. # TODO(jaegerandi): Remove branch condition once mitaka is retired. - branch: ^(?!stable/kilo).*$ + branch: ^(?!stable/thisbranchnamewillneverexist).*$ # Only run job if at least one po or pot file was changed files: - '^.*\.po$' @@ -3252,15 +3253,15 @@ jobs: # Some projects do not have releasenotes until the Newton cycle - name: ^gate-(manila-ui|networking-odl|oslo.(messaging|cache|concurrency|middleware|privsep|rootwrap|service|context|vmware|policy)|tacker)-releasenotes$ - branch: ^(?!stable/(?:kilo|liberty|mitaka)).*$ + branch: ^(?!stable/mitaka).*$ # Some python client projects do not have releasenotes until the Ocata cycle - name: ^gate-python-(tripleo)client-releasenotes$ - branch: ^(?!stable/(?:kilo|liberty|mitaka|newton)).*$ + branch: ^(?!stable/(?:mitaka|newton)).*$ # Some projects do not have releasenotes until the Ocata cycle - name: ^gate-(automaton|debtcollector|futurist|networking-sfc|osprofiler|oslo.(i18n|reports|serialization|utils|versionedobjects)|oslosphinx|oslotest|stevedore|taskflow|tooz)-releasenotes$ - branch: ^(?!stable/(?:kilo|liberty|mitaka|newton)).*$ + branch: ^(?!stable/(?:mitaka|newton)).*$ - name: gate-python-fuelclient-python34 branch: ^stable/(8\.0|mitaka).*$