From 81e6877b0264a34f8d9b2d9fa9aa839846311c62 Mon Sep 17 00:00:00 2001
From: Matthew Mosesohn <matthew.mosesohn@gmail.com>
Date: Fri, 26 Apr 2019 15:54:37 +0300
Subject: [PATCH] Make cilium tests pass (#4660)

Cilium requires a high kernel. rhel7 and centos7 are too low, so they are removed.
Bumping ubuntu to ubuntu-1804

Change-Id: Ib1bffa45b8f9ed0ba500f751714372b3a3f7878b
---
 .gitlab-ci/gce.yml                               |  2 +-
 .gitlab-ci/packet.yml                            | 16 +---------------
 tests/files/gce_centos7-cilium.yml               | 13 -------------
 tests/files/gce_rhel7-cilium.yml                 | 12 ------------
 ...ilium-sep.yml => gce_ubuntu18-cilium-sep.yml} |  2 +-
 tests/files/packet_centos7-cilium.yml            | 10 ----------
 tests/files/packet_rhel7-cilium.yml              | 10 ----------
 ...um-sep.yml => packet_ubuntu18-cilium-sep.yml} |  2 +-
 8 files changed, 4 insertions(+), 63 deletions(-)
 delete mode 100644 tests/files/gce_centos7-cilium.yml
 delete mode 100644 tests/files/gce_rhel7-cilium.yml
 rename tests/files/{gce_ubuntu-cilium-sep.yml => gce_ubuntu18-cilium-sep.yml} (85%)
 delete mode 100644 tests/files/packet_centos7-cilium.yml
 delete mode 100644 tests/files/packet_rhel7-cilium.yml
 rename tests/files/{packet_ubuntu-cilium-sep.yml => packet_ubuntu18-cilium-sep.yml} (86%)

diff --git a/.gitlab-ci/gce.yml b/.gitlab-ci/gce.yml
index 4c48798dd..5c0e369f1 100644
--- a/.gitlab-ci/gce.yml
+++ b/.gitlab-ci/gce.yml
@@ -146,7 +146,7 @@ gce_coreos-cilium:
   except: ['triggers']
   only: ['master', /^pr-.*$/]
 
-gce_ubuntu-cilium-sep:
+gce_ubuntu18-cilium-sep:
   stage: deploy-special
   <<: *gce
   when: manual
diff --git a/.gitlab-ci/packet.yml b/.gitlab-ci/packet.yml
index 3588f4b5e..353e0eedc 100644
--- a/.gitlab-ci/packet.yml
+++ b/.gitlab-ci/packet.yml
@@ -73,7 +73,7 @@ packet_ubuntu-contiv-sep:
   except: ['triggers']
   only: ['master', /^pr-.*$/]
 
-packet_ubuntu-cilium-sep:
+packet_ubuntu18-cilium-sep:
   stage: deploy-special
   <<: *packet
   when: manual
@@ -108,20 +108,6 @@ packet_centos7-calico-ha:
   except: ['triggers']
   only: ['master', /^pr-.*$/]
 
-packet_centos7-cilium:
-  stage: deploy-special
-  <<: *packet
-  when: manual
-  except: ['triggers']
-  only: ['master', /^pr-.*$/]
-
-packet_rhel7-cilium:
-  stage: deploy-special
-  <<: *packet
-  when: manual
-  except: ['triggers']
-  only: ['master', /^pr-.*$/]
-
 packet_centos7-kube-router:
   stage: deploy-special
   <<: *packet
diff --git a/tests/files/gce_centos7-cilium.yml b/tests/files/gce_centos7-cilium.yml
deleted file mode 100644
index f945ad5ad..000000000
--- a/tests/files/gce_centos7-cilium.yml
+++ /dev/null
@@ -1,13 +0,0 @@
----
-# Instance settings
-cloud_image_family: centos-7
-cloud_region: us-central1-c
-cloud_machine_type: "n1-standard-1"
-mode: default
-
-# Deployment settings
-kube_network_plugin: cilium
-deploy_netchecker: true
-enable_network_policy: true
-dns_min_replicas: 1
-cloud_provider: gce
diff --git a/tests/files/gce_rhel7-cilium.yml b/tests/files/gce_rhel7-cilium.yml
deleted file mode 100644
index 7a00b1b7f..000000000
--- a/tests/files/gce_rhel7-cilium.yml
+++ /dev/null
@@ -1,12 +0,0 @@
----
-# Instance settings
-cloud_image_family: rhel-7
-cloud_region: us-central1-b
-mode: default
-
-# Deployment settings
-kube_network_plugin: cilium
-deploy_netchecker: true
-enable_network_policy: true
-dns_min_replicas: 1
-cloud_provider: gce
diff --git a/tests/files/gce_ubuntu-cilium-sep.yml b/tests/files/gce_ubuntu18-cilium-sep.yml
similarity index 85%
rename from tests/files/gce_ubuntu-cilium-sep.yml
rename to tests/files/gce_ubuntu18-cilium-sep.yml
index 4965060db..7d30e6fdb 100644
--- a/tests/files/gce_ubuntu-cilium-sep.yml
+++ b/tests/files/gce_ubuntu18-cilium-sep.yml
@@ -1,6 +1,6 @@
 ---
 # Instance settings
-cloud_image_family: ubuntu-1604-lts
+cloud_image_family: ubuntu-1804-lts
 cloud_region: us-central1-b
 mode: separate
 
diff --git a/tests/files/packet_centos7-cilium.yml b/tests/files/packet_centos7-cilium.yml
deleted file mode 100644
index 2c34af258..000000000
--- a/tests/files/packet_centos7-cilium.yml
+++ /dev/null
@@ -1,10 +0,0 @@
----
-# Instance settings
-cloud_image: centos-7
-mode: default
-
-# Kubespray settings
-kube_network_plugin: cilium
-deploy_netchecker: true
-enable_network_policy: true
-dns_min_replicas: 1
diff --git a/tests/files/packet_rhel7-cilium.yml b/tests/files/packet_rhel7-cilium.yml
deleted file mode 100644
index f4e7a128f..000000000
--- a/tests/files/packet_rhel7-cilium.yml
+++ /dev/null
@@ -1,10 +0,0 @@
----
-# Instance settings
-cloud_image: rhel-server-7
-mode: default
-
-# Kubespray settings
-kube_network_plugin: cilium
-deploy_netchecker: true
-enable_network_policy: true
-dns_min_replicas: 1
diff --git a/tests/files/packet_ubuntu-cilium-sep.yml b/tests/files/packet_ubuntu18-cilium-sep.yml
similarity index 86%
rename from tests/files/packet_ubuntu-cilium-sep.yml
rename to tests/files/packet_ubuntu18-cilium-sep.yml
index 093c14213..df6caaea9 100644
--- a/tests/files/packet_ubuntu-cilium-sep.yml
+++ b/tests/files/packet_ubuntu18-cilium-sep.yml
@@ -1,6 +1,6 @@
 ---
 # Instance settings
-cloud_image: ubuntu-1604
+cloud_image: ubuntu-1804
 mode: separate
 
 # Kubespray settings