diff --git a/jenkins/jobs/nodepool.yaml b/jenkins/jobs/nodepool.yaml index b8d4fb6dc3..a81d259ad7 100644 --- a/jenkins/jobs/nodepool.yaml +++ b/jenkins/jobs/nodepool.yaml @@ -138,10 +138,7 @@ # Start with all images disabled. export NODEPOOL_PAUSE_CENTOS_7_DIB=true export NODEPOOL_PAUSE_DEBIAN_JESSIE_DIB=true - export NODEPOOL_PAUSE_FEDORA_25_DIB=true export NODEPOOL_PAUSE_FEDORA_26_DIB=true - # TODO(pabelanger): Remove 42.2 support once 42.3 is gating. - export NODEPOOL_PAUSE_OPENSUSE_42_2_DIB=true export NODEPOOL_PAUSE_OPENSUSE_423_DIB=true export NODEPOOL_PAUSE_UBUNTU_TRUSTY_DIB=true export NODEPOOL_PAUSE_UBUNTU_XENIAL_DIB=true @@ -154,12 +151,10 @@ export NODEPOOL_PAUSE_DEBIAN_JESSIE_DIB=false elif [ "{images}" == "-opensuse" ] ; then # dsvm-nodepool-opensuse-src - export NODEPOOL_PAUSE_OPENSUSE_42_2_DIB=false export NODEPOOL_PAUSE_OPENSUSE_423_DIB=false elif [ "{images}" == "-redhat" ] ; then # dsvm-nodepool-redhat-src export NODEPOOL_PAUSE_CENTOS_7_DIB=false - export NODEPOOL_PAUSE_FEDORA_25_DIB=false export NODEPOOL_PAUSE_FEDORA_26_DIB=false elif [ "{images}" == "-ubuntu" ] ; then # dsvm-nodepool-ubuntu-src @@ -168,9 +163,7 @@ fi export DEVSTACK_LOCAL_CONFIG+=$'\n'"NODEPOOL_PAUSE_CENTOS_7_DIB=$NODEPOOL_PAUSE_CENTOS_7_DIB" export DEVSTACK_LOCAL_CONFIG+=$'\n'"NODEPOOL_PAUSE_DEBIAN_JESSIE_DIB=$NODEPOOL_PAUSE_DEBIAN_JESSIE_DIB" - export DEVSTACK_LOCAL_CONFIG+=$'\n'"NODEPOOL_PAUSE_FEDORA_25_DIB=$NODEPOOL_PAUSE_FEDORA_25_DIB" export DEVSTACK_LOCAL_CONFIG+=$'\n'"NODEPOOL_PAUSE_FEDORA_26_DIB=$NODEPOOL_PAUSE_FEDORA_26_DIB" - export DEVSTACK_LOCAL_CONFIG+=$'\n'"NODEPOOL_PAUSE_OPENSUSE_42_2_DIB=$NODEPOOL_PAUSE_OPENSUSE_42_2_DIB" export DEVSTACK_LOCAL_CONFIG+=$'\n'"NODEPOOL_PAUSE_OPENSUSE_423_DIB=$NODEPOOL_PAUSE_OPENSUSE_423_DIB" export DEVSTACK_LOCAL_CONFIG+=$'\n'"NODEPOOL_PAUSE_UBUNTU_TRUSTY_DIB=$NODEPOOL_PAUSE_UBUNTU_TRUSTY_DIB" export DEVSTACK_LOCAL_CONFIG+=$'\n'"NODEPOOL_PAUSE_UBUNTU_XENIAL_DIB=$NODEPOOL_PAUSE_UBUNTU_XENIAL_DIB"