[libvirt] [jenkins-ci PATCH] guests: Use OpenJDK 8 on Debian 8 too
Signed-off-by: Andrea Bolognani <abologna(a)redhat.com>
---
guests/files/jessie-backports.preferences | 3 +++
guests/files/jessie-backports.sources | 1 +
guests/tasks/base.yml | 20 ++++++++++++++++++++
guests/vars/mappings.yml | 1 -
4 files changed, 24 insertions(+), 1 deletion(-)
create mode 100644 guests/files/jessie-backports.preferences
create mode 100644 guests/files/jessie-backports.sources
diff --git a/guests/files/jessie-backports.preferences
b/guests/files/jessie-backports.preferences
new file mode 100644
index 0000000..5e657f6
--- /dev/null
+++ b/guests/files/jessie-backports.preferences
@@ -0,0 +1,3 @@
+Package: openjdk-8-jre-headless java-common ca-certificates-java
+Pin: release a=jessie-backports
+Pin-Priority: 900
diff --git a/guests/files/jessie-backports.sources
b/guests/files/jessie-backports.sources
new file mode 100644
index 0000000..6e6d261
--- /dev/null
+++ b/guests/files/jessie-backports.sources
@@ -0,0 +1 @@
+deb http://deb.debian.org/debian/ jessie-backports main
diff --git a/guests/tasks/base.yml b/guests/tasks/base.yml
index 6acd967..a25420a 100644
--- a/guests/tasks/base.yml
+++ b/guests/tasks/base.yml
@@ -33,6 +33,26 @@
- ( os_name == 'CentOS' or
os_name == 'Fedora' )
+- name: Enable jessie-backports repository
+ copy:
+ src: files/jessie-backports.sources
+ dest: /etc/apt/sources.list.d/jessie-backports.list
+ owner: root
+ group: root
+ when:
+ - os_name == 'Debian'
+ - os_version == '8'
+
+- name: Configure APT pinning for jessie-backports
+ copy:
+ src: files/jessie-backports.preferences
+ dest: /etc/apt/preferences.d/jessie-backports
+ owner: root
+ group: root
+ when:
+ - os_name == 'Debian'
+ - os_version == '8'
+
- name: Bootstrap the package module
command: apt-get install -y python-apt
args:
diff --git a/guests/vars/mappings.yml b/guests/vars/mappings.yml
index cae9d23..d620b5d 100644
--- a/guests/vars/mappings.yml
+++ b/guests/vars/mappings.yml
@@ -175,7 +175,6 @@ mappings:
deb: openjdk-8-jre-headless
pkg: openjdk8-jre
rpm: java-1.8.0-openjdk-headless
- Debian8: openjdk-7-jre-headless
Ubuntu12: openjdk-7-jre-headless
Ubuntu14: openjdk-7-jre-headless
--
2.13.6