[libvirt] [jenkins-ci PATCH 2/2] guests: Drop Debian 8
Andrea Bolognani
abologna at redhat.com
Thu Mar 28 16:26:19 UTC 2019
This allows us to also drop a few things that we were keeping
around exclusively for this distribution.
Signed-off-by: Andrea Bolognani <abologna at redhat.com>
---
guests/host_vars/libvirt-debian-8/docker.yml | 2 -
guests/host_vars/libvirt-debian-8/install.yml | 2 -
guests/host_vars/libvirt-debian-8/main.yml | 20 -----
guests/inventory | 1 -
guests/playbooks/update/tasks/base.yml | 22 ------
guests/playbooks/update/tasks/bootstrap.yml | 6 --
.../templates/jessie-backports.preferences.j2 | 3 -
.../templates/jessie-backports.sources.j2 | 1 -
guests/vars/mappings.yml | 7 --
guests/vars/vault.yml | 78 +++++++++----------
10 files changed, 37 insertions(+), 105 deletions(-)
delete mode 100644 guests/host_vars/libvirt-debian-8/docker.yml
delete mode 100644 guests/host_vars/libvirt-debian-8/install.yml
delete mode 100644 guests/host_vars/libvirt-debian-8/main.yml
delete mode 100644 guests/playbooks/update/templates/jessie-backports.preferences.j2
delete mode 100644 guests/playbooks/update/templates/jessie-backports.sources.j2
diff --git a/guests/host_vars/libvirt-debian-8/docker.yml b/guests/host_vars/libvirt-debian-8/docker.yml
deleted file mode 100644
index 235f0fd..0000000
--- a/guests/host_vars/libvirt-debian-8/docker.yml
+++ /dev/null
@@ -1,2 +0,0 @@
----
-docker_base: debian:8
diff --git a/guests/host_vars/libvirt-debian-8/install.yml b/guests/host_vars/libvirt-debian-8/install.yml
deleted file mode 100644
index 299a1a6..0000000
--- a/guests/host_vars/libvirt-debian-8/install.yml
+++ /dev/null
@@ -1,2 +0,0 @@
----
-install_url: http://deb.debian.org/debian/dists/jessie/main/installer-amd64/
diff --git a/guests/host_vars/libvirt-debian-8/main.yml b/guests/host_vars/libvirt-debian-8/main.yml
deleted file mode 100644
index c5b82b3..0000000
--- a/guests/host_vars/libvirt-debian-8/main.yml
+++ /dev/null
@@ -1,20 +0,0 @@
----
-projects:
- - libosinfo
- - libvirt
- - libvirt-glib
- - libvirt-go
- - libvirt-go-xml
- - libvirt-perl
- - libvirt-python
- - libvirt-sandbox
- - libvirt-tck
- - osinfo-db
- - osinfo-db-tools
- - virt-viewer
-
-package_format: 'deb'
-os_name: 'Debian'
-os_version: '8'
-
-ansible_python_interpreter: /usr/bin/python2
diff --git a/guests/inventory b/guests/inventory
index 7619ffc..4cf8e1b 100644
--- a/guests/inventory
+++ b/guests/inventory
@@ -1,5 +1,4 @@
libvirt-centos-7
-libvirt-debian-8
libvirt-debian-9
libvirt-debian-sid
libvirt-fedora-28
diff --git a/guests/playbooks/update/tasks/base.yml b/guests/playbooks/update/tasks/base.yml
index 5cffbeb..d71d99f 100644
--- a/guests/playbooks/update/tasks/base.yml
+++ b/guests/playbooks/update/tasks/base.yml
@@ -1,26 +1,4 @@
---
-- name: Enable jessie-backports repository
- template:
- src: '{{ playbook_base }}/templates/jessie-backports.sources.j2'
- dest: /etc/apt/sources.list.d/jessie-backports.list
- owner: root
- group: root
- when:
- - os_name == 'Debian'
- - os_version == '8'
- - flavor == 'jenkins'
-
-- name: Configure APT pinning for jessie-backports
- template:
- src: '{{ playbook_base }}/templates/jessie-backports.preferences.j2'
- dest: /etc/apt/preferences.d/jessie-backports
- owner: root
- group: root
- when:
- - os_name == 'Debian'
- - os_version == '8'
- - flavor == 'jenkins'
-
- name: Enable fedora-rawhide-kernel-nodebug repository
template:
src: '{{ playbook_base }}/templates/fedora-rawhide-kernel-nodebug.repo.j2'
diff --git a/guests/playbooks/update/tasks/bootstrap.yml b/guests/playbooks/update/tasks/bootstrap.yml
index f2b40e0..44bb2c9 100644
--- a/guests/playbooks/update/tasks/bootstrap.yml
+++ b/guests/playbooks/update/tasks/bootstrap.yml
@@ -13,12 +13,6 @@
- os_name == 'CentOS'
- os_version == '7'
-- set_fact:
- python: python
- when:
- - os_name == 'Debian'
- - os_version == '8'
-
- name: Bootstrap Ansible
raw: 'yum install -y {{ python }}'
when:
diff --git a/guests/playbooks/update/templates/jessie-backports.preferences.j2 b/guests/playbooks/update/templates/jessie-backports.preferences.j2
deleted file mode 100644
index 5e657f6..0000000
--- a/guests/playbooks/update/templates/jessie-backports.preferences.j2
+++ /dev/null
@@ -1,3 +0,0 @@
-Package: openjdk-8-jre-headless java-common ca-certificates-java
-Pin: release a=jessie-backports
-Pin-Priority: 900
diff --git a/guests/playbooks/update/templates/jessie-backports.sources.j2 b/guests/playbooks/update/templates/jessie-backports.sources.j2
deleted file mode 100644
index 6e6d261..0000000
--- a/guests/playbooks/update/templates/jessie-backports.sources.j2
+++ /dev/null
@@ -1 +0,0 @@
-deb http://deb.debian.org/debian/ jessie-backports main
diff --git a/guests/vars/mappings.yml b/guests/vars/mappings.yml
index e9353f8..edd658e 100644
--- a/guests/vars/mappings.yml
+++ b/guests/vars/mappings.yml
@@ -153,7 +153,6 @@ mappings:
pkg: py36-flake8
rpm: python3-flake8
CentOS7:
- Debian8:
fuse:
deb: libfuse-dev
@@ -190,7 +189,6 @@ mappings:
glusterfs:
deb: libglusterfs-dev
rpm: glusterfs-api-devel
- Debian8: glusterfs-common
Debian9: glusterfs-common
Ubuntu16: glusterfs-common
Ubuntu18: glusterfs-common
@@ -227,7 +225,6 @@ mappings:
gtk-update-icon-cache:
default: gtk-update-icon-cache
- Debian8: libgtk2.0-bin
Ubuntu16: libgtk2.0-bin
gtk-vnc2:
@@ -324,7 +321,6 @@ mappings:
libgovirt:
rpm: libgovirt-devel
Debian: libgovirt-dev
- Debian8:
cross-policy-deb: foreign
libiscsi:
@@ -610,7 +606,6 @@ mappings:
numad:
default: numad
FreeBSD:
- Debian8:
ocaml:
default: ocaml
@@ -804,7 +799,6 @@ mappings:
default: python3-libxml2
FreeBSD: py36-libxml2
CentOS7:
- Debian8:
Ubuntu16:
python3-lxml:
@@ -906,7 +900,6 @@ mappings:
wireshark:
deb: wireshark-dev
Fedora: wireshark-devel
- Debian8:
cross-policy-deb: skip
xen:
diff --git a/guests/vars/vault.yml b/guests/vars/vault.yml
index 4d51fbb..7b1fc34 100644
--- a/guests/vars/vault.yml
+++ b/guests/vars/vault.yml
@@ -1,42 +1,38 @@
$ANSIBLE_VAULT;1.1;AES256
-30646332646365623231356439373464646464333463383363383036656338373163306636303363
-6439363134666263336362663232613933636138303730390a336365336264376464303436636630
-61323131636136633262613165343933306661616462633161343638326162646339303738616137
-3435343133313837350a656463396464366566376130356634643732616239663433373631303633
-62396633346533633163303433316638663764316633623532643266373436633764653861306235
-66646362396166383536623132646535343364323061613766643431313661353432363339666434
-32663939643263363265336135353439653661643161616537616131376466663139383961623732
-33393065323933643461333062313534646134346264613566376635326331306538383437653834
-61316533633736633432626361626238326532376236373531633430323537333132636637346232
-39326662373036616566653861643534643737323531616164333537626333653339313961626634
-34646362613263373235303734343466313032333232313039653364623266626537643131393563
-63656632666136633165316538346163373835623539326231646131373531383162313332643132
-32626662316330363836383764323966666265346435353037666536396462623336313764376430
-64656662333862393131613965633863343936326535643166666230643963633766323332663066
-62306532323432626664623838353439336334613033376136623734343664373630376534316336
-31393363313265643035626439616131636135313836333137616134623665666535663731303437
-66666634333931323739656631333562663231643738363233623561326363626339663066356664
-63656463306235343739333235333564363764353835306162616236383961356463383364393139
-61646432386362303535623065333061613534336365623339663435383231353230373539633237
-35316530636633323231343464313162633436623334356131376137633165363361623134366434
-62303437653833626466643339316362653363346530343032623462663539393930633035663838
-38393130623536313332343537613833333564316438376432393063613062353931653264326662
-36303631663638633833643630636237393538626134306237323963313438613461346439313839
-31353666653939326333373364376232623638623339376535613662353937353634316166633663
-36633762356334393066326536363066376638663561613864623739313131636666393134366237
-38376566393539353231613730346433653235366237626166616565353730363665643964363236
-66326564303765666237626237653736623336376336356631343564306437393734383431313530
-61353639366338663236643037373665626634353166373935383965303237613561623262376564
-65353063653764663636336534363665656532336532353037313065633836326435303365626537
-30633638346261646233333736376238613332316131303739393137363831633164613262653031
-64383733636666653461633066303763653265633635316464366561353265383539666466356636
-38656232343466353734353263623130623133613064643930393563616164333233663737343335
-30623233383936313762373934643536373534306230386131636534653866646339646438653261
-39623131633836363934656333383032646433623430663138386532626332336363373066336235
-63643166356630366164343566653134323037333238636335353266633036343533633464346532
-32313364613037616531303766656461316438643232646639373564643331376438613237626131
-63353238616633346462653065373137613962383633386664636237373434333938353335386130
-33303866323662363137656562383965626566356663373761653531653536306562353435376639
-66333133373037633362613231656439623931623164393131323063353934333134346365636164
-34396537313863383762633535636263336230333966366533626161336430663031366334623064
-30646566373037393161343231393665316339666635346662663031626161643137
+35333336313038633063316163373930373635333637313762653564383564616636376565343561
+6233373264393666323234306565303938373838343035340a336362303236366563333933623838
+62346336373034363430653531646263353964623738343831303035626161353865666439323139
+6232316261356362650a636530333931643934343836643732633861323332646139313534633833
+30383838633237343132663333356361343462363466336463396264616339306334646666613035
+61613933336563356236376637373934363034323062626238396435356138626364316236626633
+37663062383132386337393762633938643534333435616462366636633764303066613238616231
+65346262656432393763343463353636323864343561396536306333306465636638643861613662
+66396663303438323237666337636138663862613533636136633963633033323563656434626536
+66303738313964386163386631326464653161613666646335633836383662366231646561353232
+61373362373238346337613061383333323332666432383433663862393533623239616361623430
+39616634613434666430386336356430353932303162313363316131626361643064373963656638
+34616633313061623662306235383365663732356539386365323131623965313238383238613936
+36663964353338643334373164356337326232316465323938653630363731346338613061656331
+32653932616630653935636137663464353335376332626331396464393562613962326263626666
+62396638646135633138353634346639343361646430626162313661623863623364643561376130
+36363539313334393366646531343735313966663430626238653038616530616665613639323938
+33353665646631643731356362386662303538663730383966303665633535363433373839376634
+65613665313366386637306634323836313661633832306338333561313763336539353838346364
+34333263343930306635353736376534353236656339666337646462323264356236383935333933
+65613035643634396331363330656432633233633763346632316130623963633430636562343062
+38393363396265333335346631653439373738613265316238366132333639343735616335363064
+36316434346536633436626361633138393361363134383266313138653632616162346166326666
+37643264613033323836373166656365393464616634313537383430643863376239386361323566
+62623930663337383632663739643165383966316566373162653432666632346237643862356538
+61663035316363333433363363373239336436626534663539373634313132396534633461306236
+65623537386236363838336339636236383337383532303636373765373230316461373835336630
+63313066356166643163323633303638313837386538316339383964393634373739646361313734
+38303262643363623632376237623562383638623463623036353139383038623364663661396136
+61656461356539393435313434386234326630376663346262646364663335643136613161326236
+31383164383637326132323338346134383036663535383864393366653063663137383764633730
+66383462323331643535653763333862323666373538663738366663343938633437303466666363
+63376131663564363032636661303365303031646364623334323263633239666434333730386564
+36373233366638346630343737303139346537323161633561323566343966333264666431313633
+34373537333330656233393636396337656635623163613235303939666165643436373466396134
+38643165663431616637336265363931393233653935333834653031306335663535303364373762
+6531
--
2.20.1
More information about the libvir-list
mailing list