From 2fff2388d062df936da940ccc9a19182b08e9e86 Mon Sep 17 00:00:00 2001
From: Piotr Gawron <piotr.gawron@uni.lu>
Date: Mon, 6 May 2019 18:36:17 +0200
Subject: [PATCH] ci adapted for the new debian dependencies

---
 .gitlab-ci.yml | 8 --------
 1 file changed, 8 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 72f263e0c3..10fa23406f 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -231,13 +231,9 @@ test_upgrade_debian_package:
      - version=$(echo $debian_file| cut -f2 -d"_")
      - echo "PUT $debian_file /docker/incoming" | sftp -o StrictHostKeyChecking=no user@debian-repo
      - ssh root@debian-repo /usr/local/sbin/reprepro-import
-     - apt-add-repository "deb http://ppa.launchpad.net/webupd8team/java/ubuntu trusty main"
-     - apt-key adv --no-tty --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys EEA14886
      - apt-add-repository "deb http://repo-r3lab.uni.lu/debian/ stable main"
      - apt-key adv --no-tty --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 0xcb185f4e31872412
      - apt-get update
-# auto accept oracle license
-     - echo debconf shared/accepted-oracle-license-v1-1 select true | debconf-set-selections
 #hacky way of installing minerva on docker - by default rc-invoke is preventing services changes on docker
      - mv /usr/sbin/policy-rc.d /usr/sbin/policy-rc.d.backup
      - mv gitlab-ci-policy-rc.d /usr/sbin/policy-rc.d
@@ -278,12 +274,8 @@ test_install_debian_package:
      - debian_file=$(ls debian/*.deb)
      - echo "PUT $debian_file /docker/incoming" | sftp -o StrictHostKeyChecking=no user@debian-repo
      - ssh root@debian-repo /usr/local/sbin/reprepro-import
-     - apt-add-repository "deb http://ppa.launchpad.net/webupd8team/java/ubuntu trusty main"
-     - apt-key adv --no-tty --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys EEA14886
      - apt-add-repository "deb http://debian-repo/ unstable main"
      - apt-get update
-# auto accept oracle license
-     - echo debconf shared/accepted-oracle-license-v1-1 select true | debconf-set-selections
 #hacky way of installing minerva on docker - by default rc-invoke is preventing services changes on docker
      - mv /usr/sbin/policy-rc.d /usr/sbin/policy-rc.d.backup
      - mv gitlab-ci-policy-rc.d /usr/sbin/policy-rc.d
-- 
GitLab