openstack/project-config
Code Issues Proposed changes

Remove fedora-24 from openstack-infra

Browse Source 
Now that we have migrated all our jobs to fedora-25, we can remove
fedora-24 from project-config.

Change-Id: I3a58c785c12f779060a6dca5cd40ddcc46429971
Signed-off-by: Paul Belanger <pabelanger@redhat.com>
This commit is contained in:
Paul Belanger 2017-01-21 15:58:03 -05:00
parent d9fd9891e5
commit 736cee2421
3 changed files with 1 additions and 130 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
jenkins/jobs/nodepool.yaml
View File

@ -96,9 +96,6 @@
if [ "{images}" == "-redhat" ] ; then if [ "{images}" == "-redhat" ] ; then
export NODEPOOL_PAUSE_CENTOS_7_DIB=false export NODEPOOL_PAUSE_CENTOS_7_DIB=false
# TODO(pabelanger): Remove fedora-24 once deleted from
# nodepool.yaml.
export NODEPOOL_PAUSE_FEDORA_24_DIB=false
export NODEPOOL_PAUSE_FEDORA_25_DIB=false export NODEPOOL_PAUSE_FEDORA_25_DIB=false
export NODEPOOL_PAUSE_UBUNTU_PRECISE_DIB=true export NODEPOOL_PAUSE_UBUNTU_PRECISE_DIB=true
export NODEPOOL_PAUSE_UBUNTU_TRUSTY_DIB=true export NODEPOOL_PAUSE_UBUNTU_TRUSTY_DIB=true
@ -111,9 +108,6 @@
export DEVSTACK_LOCAL_CONFIG+=$'\n'"NODEPOOL_PAUSE_UBUNTU_XENIAL_DIB=$NODEPOOL_PAUSE_UBUNTU_XENIAL_DIB" export DEVSTACK_LOCAL_CONFIG+=$'\n'"NODEPOOL_PAUSE_UBUNTU_XENIAL_DIB=$NODEPOOL_PAUSE_UBUNTU_XENIAL_DIB"
elif [ "{images}" == "-debian" ] ; then elif [ "{images}" == "-debian" ] ; then
export NODEPOOL_PAUSE_CENTOS_7_DIB=true export NODEPOOL_PAUSE_CENTOS_7_DIB=true
# TODO(pabelanger): Remove fedora-24 once deleted from
# nodepool.yaml.
export NODEPOOL_PAUSE_FEDORA_24_DIB=true
export NODEPOOL_PAUSE_FEDORA_25_DIB=true export NODEPOOL_PAUSE_FEDORA_25_DIB=true
export NODEPOOL_PAUSE_UBUNTU_PRECISE_DIB=false export NODEPOOL_PAUSE_UBUNTU_PRECISE_DIB=false
export NODEPOOL_PAUSE_UBUNTU_TRUSTY_DIB=false export NODEPOOL_PAUSE_UBUNTU_TRUSTY_DIB=false

121
nodepool/nodepool.yaml
View File

@ -161,23 +161,6 @@ labels:
- name: osic-cloud1-disk - name: osic-cloud1-disk
- name: infracloud-vanilla - name: infracloud-vanilla
- name: infracloud-chocolate - name: infracloud-chocolate
- name: fedora-24
image: fedora-24
ready-script: configure_mirror.sh
min-ready: 0
providers:
- name: rax-dfw
- name: rax-ord
- name: rax-iad
- name: ovh-gra1
- name: ovh-bhs1
- name: bluebox-sjc1
- name: internap-mtl01
- name: osic-cloud1-s3500
- name: osic-cloud1-s3700
- name: osic-cloud1-disk
- name: infracloud-vanilla
- name: infracloud-chocolate
- name: fedora-25 - name: fedora-25
image: fedora-25 image: fedora-25
ready-script: configure_mirror.sh ready-script: configure_mirror.sh
@ -295,13 +278,6 @@ providers:
private-key: /home/nodepool/.ssh/id_rsa private-key: /home/nodepool/.ssh/id_rsa
name-filter: 'Performance' name-filter: 'Performance'
config-drive: true config-drive: true
- name: fedora-24
min-ram: 8192
diskimage: fedora-24
username: jenkins
private-key: /home/nodepool/.ssh/id_rsa
name-filter: 'Performance'
config-drive: true
- name: fedora-25 - name: fedora-25
min-ram: 8192 min-ram: 8192
diskimage: fedora-25 diskimage: fedora-25
@ -355,13 +331,6 @@ providers:
private-key: /home/nodepool/.ssh/id_rsa private-key: /home/nodepool/.ssh/id_rsa
name-filter: 'Performance' name-filter: 'Performance'
config-drive: true config-drive: true
- name: fedora-24
min-ram: 8192
diskimage: fedora-24
username: jenkins
private-key: /home/nodepool/.ssh/id_rsa
name-filter: 'Performance'
config-drive: true
- name: fedora-25 - name: fedora-25
min-ram: 8192 min-ram: 8192
diskimage: fedora-25 diskimage: fedora-25
@ -415,13 +384,6 @@ providers:
private-key: /home/nodepool/.ssh/id_rsa private-key: /home/nodepool/.ssh/id_rsa
name-filter: 'Performance' name-filter: 'Performance'
config-drive: true config-drive: true
- name: fedora-24
min-ram: 8192
diskimage: fedora-24
username: jenkins
private-key: /home/nodepool/.ssh/id_rsa
name-filter: 'Performance'
config-drive: true
- name: fedora-25 - name: fedora-25
min-ram: 8192 min-ram: 8192
diskimage: fedora-25 diskimage: fedora-25
@ -473,13 +435,6 @@ providers:
username: jenkins username: jenkins
private-key: /home/nodepool/.ssh/id_rsa private-key: /home/nodepool/.ssh/id_rsa
config-drive: true config-drive: true
- name: fedora-24
min-ram: 8000
name-filter: 'ssd-osFoundation-3'
diskimage: fedora-24
username: jenkins
private-key: /home/nodepool/.ssh/id_rsa
config-drive: true
- name: fedora-25 - name: fedora-25
min-ram: 8000 min-ram: 8000
name-filter: 'ssd-osFoundation-3' name-filter: 'ssd-osFoundation-3'
@ -531,13 +486,6 @@ providers:
username: jenkins username: jenkins
private-key: /home/nodepool/.ssh/id_rsa private-key: /home/nodepool/.ssh/id_rsa
config-drive: true config-drive: true
- name: fedora-24
min-ram: 8000
name-filter: 'ssd-osFoundation-3'
diskimage: fedora-24
username: jenkins
private-key: /home/nodepool/.ssh/id_rsa
config-drive: true
- name: fedora-25 - name: fedora-25
min-ram: 8000 min-ram: 8000
name-filter: 'ssd-osFoundation-3' name-filter: 'ssd-osFoundation-3'
@ -589,13 +537,6 @@ providers:
username: jenkins username: jenkins
private-key: /home/nodepool/.ssh/id_rsa private-key: /home/nodepool/.ssh/id_rsa
config-drive: true config-drive: true
- name: fedora-24
min-ram: 8000
name-filter: 'nodepool'
diskimage: fedora-24
username: jenkins
private-key: /home/nodepool/.ssh/id_rsa
config-drive: true
- name: fedora-25 - name: fedora-25
min-ram: 8000 min-ram: 8000
name-filter: 'nodepool' name-filter: 'nodepool'
@ -646,13 +587,6 @@ providers:
username: jenkins username: jenkins
private-key: /home/nodepool/.ssh/id_rsa private-key: /home/nodepool/.ssh/id_rsa
config-drive: true config-drive: true
- name: fedora-24
min-ram: 8000
name-filter: 'A1.8'
diskimage: fedora-24
username: jenkins
private-key: /home/nodepool/.ssh/id_rsa
config-drive: true
- name: fedora-25 - name: fedora-25
min-ram: 8000 min-ram: 8000
name-filter: 'A1.8' name-filter: 'A1.8'
@ -706,13 +640,6 @@ providers:
username: jenkins username: jenkins
private-key: /home/nodepool/.ssh/id_rsa private-key: /home/nodepool/.ssh/id_rsa
config-drive: true config-drive: true
- name: fedora-24
min-ram: 8000
name-filter: 'm2.medium.s3500'
diskimage: fedora-24
username: jenkins
private-key: /home/nodepool/.ssh/id_rsa
config-drive: true
- name: fedora-25 - name: fedora-25
min-ram: 8000 min-ram: 8000
name-filter: 'm2.medium.s3500' name-filter: 'm2.medium.s3500'
@ -766,13 +693,6 @@ providers:
username: jenkins username: jenkins
private-key: /home/nodepool/.ssh/id_rsa private-key: /home/nodepool/.ssh/id_rsa
config-drive: true config-drive: true
- name: fedora-24
min-ram: 8000
name-filter: 'm2.medium.s3700'
diskimage: fedora-24
username: jenkins
private-key: /home/nodepool/.ssh/id_rsa
config-drive: true
- name: fedora-25 - name: fedora-25
min-ram: 8000 min-ram: 8000
name-filter: 'm2.medium.s3700' name-filter: 'm2.medium.s3700'
@ -826,13 +746,6 @@ providers:
username: jenkins username: jenkins
private-key: /home/nodepool/.ssh/id_rsa private-key: /home/nodepool/.ssh/id_rsa
config-drive: true config-drive: true
- name: fedora-24
min-ram: 8000
name-filter: 'm2.medium.disk'
diskimage: fedora-24
username: jenkins
private-key: /home/nodepool/.ssh/id_rsa
config-drive: true
- name: fedora-25 - name: fedora-25
min-ram: 8000 min-ram: 8000
name-filter: 'm2.medium.disk' name-filter: 'm2.medium.disk'
@ -918,13 +831,6 @@ providers:
username: jenkins username: jenkins
private-key: /home/nodepool/.ssh/id_rsa private-key: /home/nodepool/.ssh/id_rsa
config-drive: true config-drive: true
- name: fedora-24
min-ram: 8000
name-filter: 'nodepool'
diskimage: fedora-24
username: jenkins
private-key: /home/nodepool/.ssh/id_rsa
config-drive: true
- name: fedora-25 - name: fedora-25
min-ram: 8000 min-ram: 8000
name-filter: 'nodepool' name-filter: 'nodepool'
@ -976,13 +882,6 @@ providers:
username: jenkins username: jenkins
private-key: /home/nodepool/.ssh/id_rsa private-key: /home/nodepool/.ssh/id_rsa
config-drive: true config-drive: true
- name: fedora-24
min-ram: 8000
name-filter: 'nodepool'
diskimage: fedora-24
username: jenkins
private-key: /home/nodepool/.ssh/id_rsa
config-drive: true
- name: fedora-25 - name: fedora-25
min-ram: 8000 min-ram: 8000
name-filter: 'nodepool' name-filter: 'nodepool'
@ -1107,26 +1006,6 @@ diskimages:
DIB_IMAGE_CACHE: /opt/dib_cache DIB_IMAGE_CACHE: /opt/dib_cache
QEMU_IMG_OPTIONS: compat=0.10 QEMU_IMG_OPTIONS: compat=0.10
DIB_GRUB_TIMEOUT: '0' DIB_GRUB_TIMEOUT: '0'
- name: fedora-24
elements:
- fedora-minimal
- vm
- simple-init
- openstack-repos
- nodepool-base
- cache-devstack
- initialize-urandom
- puppet
- cache-bindep
- growroot
- infra-package-needs
- stackviz
release: 24
env-vars:
TMPDIR: /opt/dib_tmp
DIB_CHECKSUM: '1'
DIB_IMAGE_CACHE: /opt/dib_cache
QEMU_IMG_OPTIONS: compat=0.10
- name: fedora-25 - name: fedora-25
elements: elements:
- fedora-minimal - fedora-minimal

4
nodepool/scripts/configure_mirror.sh
View File

@ -258,9 +258,7 @@ elif [ "$LSBDISTID" == "CentOS" ]; then
sudo chown root:root /etc/yum.repos.d/* sudo chown root:root /etc/yum.repos.d/*
sudo chmod 0644 /etc/yum.repos.d/* sudo chmod 0644 /etc/yum.repos.d/*
# TODO(pabelanger): Remove 'TwentyFour' check when fedora-24 is removed from elif [ "$LSBDISTID" == "Fedora" ]; then
# nodepool.yaml.
elif [ "$LSBDISTID" == "Fedora" ] && [ "$LSBDISTCODENAME" != 'TwentyFour' ]; then
echo "$YUM_REPOS_FEDORA" >/tmp/fedora.repo echo "$YUM_REPOS_FEDORA" >/tmp/fedora.repo
sudo mv /tmp/fedora.repo /etc/yum.repos.d/ sudo mv /tmp/fedora.repo /etc/yum.repos.d/
echo "$YUM_REPOS_FEDORA_UPDATES" >/tmp/fedora-updates.repo echo "$YUM_REPOS_FEDORA_UPDATES" >/tmp/fedora-updates.repo