[libvirt] [jenkins-ci PATCH 3/3] guests: Drop CentOS 6 support
Andrea Bolognani
abologna at redhat.com
Tue Jun 12 14:06:48 UTC 2018
It hasn't been a target platform for a while now, and the
last job that was running on it has been dropped too.
Signed-off-by: Andrea Bolognani <abologna at redhat.com>
---
guests/host_vars/libvirt-centos-6/install.yml | 3 -
guests/host_vars/libvirt-centos-6/main.yml | 2 -
guests/inventory | 1 -
guests/tasks/base.yml | 2 -
guests/vars/mappings.yml | 19 +---
guests/vars/projects/libvirt.yml | 1 -
guests/vars/vault.yml | 86 +++++++++----------
7 files changed, 42 insertions(+), 72 deletions(-)
delete mode 100644 guests/host_vars/libvirt-centos-6/install.yml
delete mode 100644 guests/host_vars/libvirt-centos-6/main.yml
diff --git a/guests/host_vars/libvirt-centos-6/install.yml b/guests/host_vars/libvirt-centos-6/install.yml
deleted file mode 100644
index 3a9459b..0000000
--- a/guests/host_vars/libvirt-centos-6/install.yml
+++ /dev/null
@@ -1,3 +0,0 @@
----
-install_url: http://mirror.centos.org/centos/6/os/x86_64/
-install_config: kickstart.cfg
diff --git a/guests/host_vars/libvirt-centos-6/main.yml b/guests/host_vars/libvirt-centos-6/main.yml
deleted file mode 100644
index c3a555c..0000000
--- a/guests/host_vars/libvirt-centos-6/main.yml
+++ /dev/null
@@ -1,2 +0,0 @@
----
-projects:
diff --git a/guests/inventory b/guests/inventory
index 0c8e280..6ea43d9 100644
--- a/guests/inventory
+++ b/guests/inventory
@@ -1,4 +1,3 @@
-libvirt-centos-6
libvirt-centos-7
libvirt-debian-8
libvirt-debian-9
diff --git a/guests/tasks/base.yml b/guests/tasks/base.yml
index b774b29..13d02f8 100644
--- a/guests/tasks/base.yml
+++ b/guests/tasks/base.yml
@@ -156,8 +156,6 @@
warn: no
when:
- package_format == 'rpm'
- - not ( os_name == 'CentOS' and
- os_version == '6' )
- name: Clean up packages after update
apt:
diff --git a/guests/vars/mappings.yml b/guests/vars/mappings.yml
index 9847649..92822cb 100644
--- a/guests/vars/mappings.yml
+++ b/guests/vars/mappings.yml
@@ -9,7 +9,7 @@
# - default
# - package format (deb, pkg, rpm)
# - OS name (CentOS, Debian, Fedora, FreeBSD, Ubuntu)
-# - OS version (CentOS6, Debian9, FedoraRawhide, Ubuntu18 and so on)
+# - OS version (CentOS7, Debian9, FedoraRawhide, Ubuntu18 and so on)
#
# So something like
#
@@ -58,7 +58,6 @@ mappings:
bash-completion:
default: bash-completion
- CentOS6:
ccache:
default: ccache
@@ -144,19 +143,16 @@ mappings:
go:
default: golang
FreeBSD: go
- CentOS6:
gobject-introspection:
deb: libgirepository1.0-dev
pkg: gobject-introspection
rpm: gobject-introspection-devel
- CentOS6:
gtk3:
deb: libgtk-3-dev
pkg: gtk3
rpm: gtk3-devel
- CentOS6:
gtk-doc:
default: gtk-doc
@@ -171,14 +167,12 @@ mappings:
deb: libgtk-vnc-2.0-dev
pkg: gtk-vnc
rpm: gtk-vnc2-devel
- CentOS6:
hal:
FreeBSD: hal
icoutils:
default: icoutils
- CentOS6:
intltool:
default: intltool
@@ -245,9 +239,6 @@ mappings:
Debian: libgovirt-dev
Debian8:
- libnl:
- CentOS6: libnl-devel
-
libnl3:
deb: libnl-3-dev
rpm: libnl3-devel
@@ -293,7 +284,6 @@ mappings:
rpm: libssh-devel
Debian: libssh-gcrypt-dev
Ubuntu: libssh-dev
- CentOS6:
libssh2:
deb: libssh2-1-dev
@@ -528,7 +518,6 @@ mappings:
deb: libcpan-changes-perl
pkg: p5-CPAN-Changes
rpm: perl-CPAN-Changes
- CentOS6:
perl-Config-Record:
deb: libconfig-record-perl
@@ -539,13 +528,11 @@ mappings:
deb: libdigest-perl
pkg: p5-Digest
rpm: perl-Digest
- CentOS6:
perl-Digest-MD5:
deb: libdigest-perl-md5-perl
pkg: p5-Digest-MD5
rpm: perl-Digest-MD5
- CentOS6:
perl-File-Slurp:
deb: libfile-slurp-perl
@@ -632,7 +619,6 @@ mappings:
perl-generators:
rpm: perl-generators
- CentOS6:
CentOS7:
pkg-config:
@@ -757,7 +743,6 @@ mappings:
deb: libspice-client-gtk-3.0-dev
pkg: spice-gtk
rpm: spice-gtk3-devel
- CentOS6:
sudo:
default: sudo
@@ -765,7 +750,6 @@ mappings:
tc:
deb: iproute2
rpm: iproute-tc
- CentOS6: iproute
CentOS7: iproute
unzip:
@@ -779,7 +763,6 @@ mappings:
vala:
default: vala
deb: valac
- CentOS6:
vim:
default: vim
diff --git a/guests/vars/projects/libvirt.yml b/guests/vars/projects/libvirt.yml
index 248a64e..3274564 100644
--- a/guests/vars/projects/libvirt.yml
+++ b/guests/vars/projects/libvirt.yml
@@ -22,7 +22,6 @@ packages:
- libcap-ng
- libcurl
- libdbus
- - libnl
- libnl3
- libnlroute3
- libnuma
diff --git a/guests/vars/vault.yml b/guests/vars/vault.yml
index 5bf89dc..69a61da 100644
--- a/guests/vars/vault.yml
+++ b/guests/vars/vault.yml
@@ -1,46 +1,42 @@
$ANSIBLE_VAULT;1.1;AES256
-66646139336431653964363035353762363664313738393832356132333835616363373032656335
-3439633266356532316564643762623935643736613839390a616631363336393962633464326264
-31373235323236303134356165386638663865353331353362386538386233363438623035343462
-3864656136376430360a646235373734636666373934616463363234316262376534633865616632
-32643566633531323162366134333562363463336237646130393965646335316561393565663664
-36343164373564336233363963393031363937336137303433396265323261663632373534613365
-31613838363562366564646333646638303837626638323065326237623665646264633233633537
-39373432363962396463323532353434623631383763346234343462333565383333366439393835
-30356437393232363432313334616462346164393437303330343562356461626464633935376239
-39626464316662333736643962623961343662396236306239333335373033366535623730353538
-66346164333839626563366666373432363331343030663537663536623965303333393534316538
-66623737363431303632363237323562306134376336393564366138626435343539613239623539
-39653331623466333535356166653036356564373138623461643862346161383062623738626266
-32613337323038646134336333613266386332353431656263353463656162393732343730393736
-34373033653933656565613063316463373535333836353234333536643639323037373333376338
-65666632623161326538333263626264373535633462306361633835323439663536326433616263
-66373532633865653834323565333536313731643837393834666464626565373938336537363633
-33323335633261643638643038623631633362633366393564316632383030656262383931656262
-65306265316264373732623466393935666633353730346632336262663766333833393961353565
-36383336313062363930633335346430306138656538633637623266383461323735643635613531
-38613265353736303336616638303333343739313033383363303638346266663830613534666464
-33383538303562643232626333303065313364386336366165316263363135396637623739316261
-32376332373539616334646130366262343837323832623965376566343366336563386639326333
-36653365383162623333373766393166656463393331663035616636386238396365663535383334
-39663634386133613138333730366331653262383761633462633239666132343239643735303732
-37343239383038343332656565313465666261646436333536363532376361636461336133336465
-65663561336430336664636262356362636635623961386462313437373863366134343164643762
-64653236616435326432363137646362646433316535393135353333336331313832623461623536
-35653739613834323564313163383563383633343336316533356535623838313663623464353238
-66333862623762316363636439613430363038633062663439383032393934313266316131323836
-30396163303038323564663639656161353336356435633635306538313032626566306366666135
-36383234353161313534343962336536313763306337393239626330396363396235643239306436
-31386631383666363365313434366538616130636164363536343364653861666662343065346663
-31356430653831653962333333396436626630333831343537366636336462373865643164326637
-65623237373561616164333238336463666239306564626538383666303562623632303630303335
-36386665346135623334646336663831666136323231376131383263343631643962643962336466
-38376264376662383263373562313263613866316138653862643833666134316338343863363631
-32663961366635353461303633366364333836636639386537396565333737353164616165323238
-66656666323265323361613162353835313763656637633464363131343361366435313565326664
-63663064336231633865663665666564366264366638356265396236326436623133653836376665
-30383436353663663637363337313232373430356261316465326261656161356436373265653939
-63356538663134386438666638386563393961373265363532653733373263623932613737613234
-61643536663036633132623161343935376633313364616436626561396262303765393662346632
-62353432646234383764366235623062636536666537323831316133636537306334616266363164
-64613735653731626231313931633839326663343262316362383763653832356163
+37356635383236643531373130663563383030653062366434323439383730323638623666373637
+6134653331323363616632383936343465316238623138620a316461613830373831623862303263
+37383431363061346133613938643764363263303262636637363862623866656662623534313030
+3163623062663665310a343536313232373366316535373034623534356538366266666438643966
+61643263356336346433633434336237383464366431383637643931366135383032373332393434
+66386565336165323239613666373463633039393662623934363934356439393636383565653835
+35366361366434313837386462333734303036353530363464366564363336356637633362666666
+39356138363838383832343837643064646564616665326264363333663763326163343538303231
+66336631303263363236646364633639623835386466383331626233373361656339666331363933
+31643561383866356130613265626666303038613334333264636232633334666234313565396266
+38653137383531343964343964303432343039326332356239396539353766343536373834653863
+32633132386131376263353830656364363837666333666138383136646131666336323262353762
+63346265646637653961383635376563393432346631396238333564663135323138623936383130
+64306130653931666132316438323938386336336264623532353935616364333831646434313165
+36373337663764643033356230396165353061366634363162333163623533396163333864646565
+62633133663433643338616434313437356464643034323161386262336466303365643836393537
+37323465356364656239643161383638653438333562333134663536376436616338336531333837
+65353439663663383062393533316639313634306436316531666435373139393633333666623237
+63626535323066336337313639643930383865663730383238613731396261626434323763613133
+65333739356235623133396161663262633766313432636433346336373431383765613634353464
+34626363363234643861373336353462383730333634353632653261303431333736616238383961
+36653433303935666131306339373765643632306536356538656434346335373863333565306466
+35343131663335363432343433346538303539636263353061323333313339636139663139383861
+32646563343062363634613034393430313135383530633162353661356637616439623936346532
+34646439333636336533663862333935613161616435626661313936343830356434396631356464
+33646565383931343936616438333034393837636666346336373665363834343238313062383662
+35653336666238383835646166653763336432613063623765323962646139346466326135303031
+61636361336563396465333265323932376531353132363135363431306631653161363836393831
+66396561333539336636306331313434343935326132376538633233623230396533336566343364
+39316236653761343534326632383761613835613431306338343565363732356434383632303234
+63313233303861306663613630633832356139383138663531336465623361663336306234353536
+31623562383466346437383539386434643265616137356561663530353330346233386633636133
+30383265386530346463383165316162643062663039366536663332623165386364393531343363
+33623932333361303037366165363865376565373362396631316135643633383438386261623034
+30343436386161646537633633353937666639653132353537663764633166663564346630326362
+35333433323938373362663231313863616634626363333032356230393338323861353763646332
+64633735383535326339666564326339333761643366363062363231303361353337306563666266
+63353964343864626136643766666237643536623131663936656334346335333630613866356138
+31643936643034336134333336633738666139316164323837366135343636313164663233373239
+32343933343135653635313337613932353461626538366366646566383037383766346233316666
+34303338393534366337633330346136386237653037666264613062336339343939
--
2.17.1
More information about the libvir-list
mailing list