From 0eef3c88d2f41a459aa201056d6deeae2d8a634e Mon Sep 17 00:00:00 2001
From: Lingxian Kong <anlin.kong@gmail.com>
Date: Thu, 29 Mar 2018 01:15:50 +1300
Subject: [PATCH] Install same version for k8s CLIs and k8s control plane
 services

We use kubernetes 1.9.3 to run the tests.

An experimental zuul job to run tempest on CentOS 7 is also added.

Co-Authored-By: Hunt Xu <mhuntxu@gmail.com>

Change-Id: I757684b38e754b74420ee88304e05d09231b9d58
---
 .zuul.yaml                                          |  8 ++++++++
 tools/gate/kubeadm/funcs/common.sh                  |  1 +
 tools/gate/kubeadm/playbook/deploy_k8s.yaml         |  1 -
 .../kubeadm/playbook/roles/k8s_cli/tasks/centos.yml | 13 ++++++++++++-
 .../kubeadm/playbook/roles/k8s_cli/tasks/main.yml   | 10 ----------
 .../kubeadm/playbook/roles/k8s_cli/tasks/ubuntu.yml | 10 ++++++++++
 6 files changed, 31 insertions(+), 12 deletions(-)

diff --git a/.zuul.yaml b/.zuul.yaml
index da587fd9..ce9f619e 100644
--- a/.zuul.yaml
+++ b/.zuul.yaml
@@ -58,6 +58,11 @@
       # deployment to avoid tests failing of no avaliable pod.
       tempest_concurrency: 3
 
+- job:
+    name: qinling-tempest-centos7
+    parent: qinling-tempest
+    nodeset: devstack-single-node-centos-7
+
 - project:
     check:
       jobs:
@@ -67,3 +72,6 @@
     gate:
       jobs:
         - openstack-tox-lower-constraints
+    experimental:
+      jobs:
+        - qinling-tempest-centos7
diff --git a/tools/gate/kubeadm/funcs/common.sh b/tools/gate/kubeadm/funcs/common.sh
index d7e1424d..40f18032 100644
--- a/tools/gate/kubeadm/funcs/common.sh
+++ b/tools/gate/kubeadm/funcs/common.sh
@@ -34,6 +34,7 @@ function base_install {
       initscripts \
       nmap \
       lshw \
+      screen \
       ansible
   elif [ "x$HOST_OS" == "xfedora" ]; then
     sudo dnf install -y \
diff --git a/tools/gate/kubeadm/playbook/deploy_k8s.yaml b/tools/gate/kubeadm/playbook/deploy_k8s.yaml
index 7a46174e..5b02aa5f 100644
--- a/tools/gate/kubeadm/playbook/deploy_k8s.yaml
+++ b/tools/gate/kubeadm/playbook/deploy_k8s.yaml
@@ -11,7 +11,6 @@
       with_items:
         - python
         - unzip
-        - httpie
 
     - name: Gather facts after python installation
       setup: filter=ansible_*
diff --git a/tools/gate/kubeadm/playbook/roles/k8s_cli/tasks/centos.yml b/tools/gate/kubeadm/playbook/roles/k8s_cli/tasks/centos.yml
index 72d2a93c..6ee40628 100644
--- a/tools/gate/kubeadm/playbook/roles/k8s_cli/tasks/centos.yml
+++ b/tools/gate/kubeadm/playbook/roles/k8s_cli/tasks/centos.yml
@@ -6,7 +6,18 @@
     baseurl: https://packages.cloud.google.com/yum/repos/kubernetes-el7-x86_64
     enabled: yes
     gpgcheck: yes
-    repo_gpgcheck: yes
+    # Got "repomd.xml signature could not be verified for kubernetes" on zuul
+    repo_gpgcheck: no
     gpgkey:
       - https://packages.cloud.google.com/yum/doc/yum-key.gpg
       - https://packages.cloud.google.com/yum/doc/rpm-package-key.gpg
+
+- name: Install kube CLIs
+  package:
+    name: "{{ item }}"
+    state: present
+    update_cache: yes
+  with_items:
+    - kubelet-1.9.3
+    - kubectl-1.9.3
+    - kubeadm-1.9.3
diff --git a/tools/gate/kubeadm/playbook/roles/k8s_cli/tasks/main.yml b/tools/gate/kubeadm/playbook/roles/k8s_cli/tasks/main.yml
index b7c1b413..f114713d 100644
--- a/tools/gate/kubeadm/playbook/roles/k8s_cli/tasks/main.yml
+++ b/tools/gate/kubeadm/playbook/roles/k8s_cli/tasks/main.yml
@@ -7,16 +7,6 @@
   when:
     ansible_pkg_mgr == 'yum'
 
-- name: Install kube CLIs
-  package:
-    name: "{{ item }}"
-    state: present
-    update_cache: yes
-  with_items:
-    - kubelet
-    - kubeadm
-    - kubectl
-
 - name: Start kubelet
   systemd:
     name: kubelet
diff --git a/tools/gate/kubeadm/playbook/roles/k8s_cli/tasks/ubuntu.yml b/tools/gate/kubeadm/playbook/roles/k8s_cli/tasks/ubuntu.yml
index 3f457da0..255ef5ca 100644
--- a/tools/gate/kubeadm/playbook/roles/k8s_cli/tasks/ubuntu.yml
+++ b/tools/gate/kubeadm/playbook/roles/k8s_cli/tasks/ubuntu.yml
@@ -8,3 +8,13 @@
   apt_repository:
     repo: 'deb http://apt.kubernetes.io/ kubernetes-xenial main'
     state: present
+
+- name: Install kube CLIs
+  package:
+    name: "{{ item }}"
+    state: present
+    update_cache: yes
+  with_items:
+    - kubelet=1.9.3-00
+    - kubectl=1.9.3-00
+    - kubeadm=1.9.3-00