From 78be27e18f95c407b6aab18837684e0b3b6e561e Mon Sep 17 00:00:00 2001
From: Antoine Legrand <2t.antoine@gmail.com>
Date: Wed, 22 Aug 2018 16:02:07 +0200
Subject: [PATCH] Add ubuntu18 job

---
 .gitlab-ci.yml                           | 17 ++++++++++++++++-
 tests/files/gce_ubuntu18-flannel-aio.yml | 14 ++++++++++++++
 2 files changed, 30 insertions(+), 1 deletion(-)
 create mode 100644 tests/files/gce_ubuntu18-flannel-aio.yml

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 5ba68ab05..e321be9d0 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -240,6 +240,10 @@ before_script:
 # stage: deploy-part1
   MOVED_TO_GROUP_VARS: "true"
 
+.ubuntu18_flannel_aio_variables: &ubuntu18_flannel_aio_variables
+# stage: deploy-part1
+  MOVED_TO_GROUP_VARS: "true"
+
 .ubuntu_canal_ha_variables: &ubuntu_canal_ha_variables
 # stage: deploy-part1
   UPGRADE_TEST: "graceful"
@@ -263,7 +267,7 @@ before_script:
 .ubuntu_cilium_sep_variables: &ubuntu_cilium_sep_variables
 # stage: deploy-special
   MOVED_TO_GROUP_VARS: "true"
-  
+
 .rhel7_weave_variables: &rhel7_weave_variables
 # stage: deploy-part1
   MOVED_TO_GROUP_VARS: "true"
@@ -330,6 +334,17 @@ gce_coreos-calico-aio:
   except: ['triggers']
   only: [/^pr-.*$/]
 
+gce_ubuntu18-flannel-aio:
+  stage: deploy-part1
+  <<: *job
+  <<: *gce
+  variables:
+    <<: *ubuntu18_flannel_aio_variables
+    <<: *gce_variables
+  when: on_success
+  except: ['triggers']
+  only: [/^pr-.*$/]
+
 ### PR JOBS PART2
 gce_centos7-flannel-addons:
   stage: deploy-part2
diff --git a/tests/files/gce_ubuntu18-flannel-aio.yml b/tests/files/gce_ubuntu18-flannel-aio.yml
new file mode 100644
index 000000000..d9b552f06
--- /dev/null
+++ b/tests/files/gce_ubuntu18-flannel-aio.yml
@@ -0,0 +1,14 @@
+# Instance settings
+cloud_image_family: ubuntu-1804-lts
+cloud_region: us-central1-a
+cloud_machine_type: "n1-standard-2"
+mode: aio
+
+# Deployment settings
+
+bootstrap_os: ubuntu
+kube_network_plugin: flannel
+
+deploy_netchecker: true
+kubedns_min_replicas: 1
+cloud_provider: gce