Merge pull request #480 from samvarankashyap/master

Author: paas-bot

Jenkinsfile

@@ -71,6 +71,7 @@ properties(
                                 string(defaultValue: 'stable', description: 'Tag for ostree-compose image', name: 'OSTREE_COMPOSE_TAG'),
                                 string(defaultValue: 'stable', description: 'Tag for ostree-image-compose image', name: 'OSTREE_IMAGE_COMPOSE_TAG'),
                                 string(defaultValue: 'stable', description: 'Tag for singlehost test image', name: 'SINGLEHOST_TEST_TAG'),
+                                string(defaultValue: 'stable', description: 'Tag for linchpin-libvirt image', name: 'LINCHPIN_LIBVIRT_TAG'),
                                 string(defaultValue: '172.30.254.79:5000', description: 'Docker repo url for Openshift instance', name: 'DOCKER_REPO_URL'),
                                 string(defaultValue: 'continuous-infra', description: 'Project namespace for Openshift operations', name: 'OPENSHIFT_NAMESPACE'),
                                 string(defaultValue: 'jenkins', description: 'Service Account for Openshift operations', name: 'OPENSHIFT_SERVICE_ACCOUNT'),
@@ -452,7 +453,7 @@ podTemplate(name: podName,
                         pipelineUtils.setStageEnvVars(currentStage)
 
                         // run linchpin workspace for e2e tests
-                        //pipelineUtils.executeInContainer(currentStage, "linchpin-libvirt", "/root/linchpin_workspace/run_e2e_tests.sh")
+                        pipelineUtils.executeInContainer(currentStage, "linchpin-libvirt", "/root/linchpin_workspace/run_e2e_tests.sh")
                     }
 
                 } catch (e) {

config/Dockerfiles/linchpin-libvirt/Dockerfile

@@ -38,17 +38,17 @@ RUN yum install -y python34 --nogpgcheck
 RUN pip install pip --upgrade && pip install setuptools --upgrade
 RUN ssh-keygen -f /root/.ssh/id_rsa -t rsa -N ''
 RUN printf "Host *\n    StrictHostKeyChecking no" > /root/.ssh/config
-ADD linchpin_workspace /root/linchpin_workspace
+ADD linchpin_workspace15 /root/linchpin_workspace
 WORKDIR "/root/linchpin_workspace/hooks/ansible/"
 RUN git clone -b release-3.6 https://github.com/openshift/openshift-ansible
 RUN git clone -b v1.1 https://github.com/samvarankashyap/paas-sig-ci
 WORKDIR "/tmp/"
-RUN git clone -b libvirt_cloudconfig7 https://github.com/samvarankashyap/linchpin
+#RUN git clone -b file_module_patch https://github.com/samvarankashyap/linchpin
+RUN git clone -b develop https://github.com/samvarankashyap/linchpin
 WORKDIR "/tmp/linchpin"
 RUN "$PWD/install.sh"
 RUN cd /tmp/linchpin && python /tmp/linchpin/setup.py install
 WORKDIR "/root/linchpin_workspace/"
-
 #END: Linchpin specific workspace installations
 
 #START: Install origin-tests rpms

config/Dockerfiles/linchpin-libvirt/linchpin_workspace/PinFile

@@ -0,0 +1,24 @@
+libvirt_one:
+  topology: example-topology.yml
+  layout: example-layout.yml
+  hooks:
+    postup:
+      - name: generate_openshift_inv
+        type: ansible
+        actions:
+          - playbook: generate_openshift_inv.yml
+      - name: install_openshift
+        type: ansible
+        context: false
+        actions:
+          - playbook: main.yml
+      - name: run_e2e_tests                                                                                     
+        type: ansible                                                                                                                  
+        context: false
+        actions:
+          - playbook: main.yml
+      - name: display_results
+        type: shell
+        context: false
+        actions:
+          - tail /tmp/e2e.log

config/Dockerfiles/linchpin-libvirt/linchpin_workspace/run_e2e_tests.sh

@@ -0,0 +1,17 @@
+#!/usr/bin/env python
+import os
+import sys
+import glob
+
+def get_inv_file(filepath):
+    list_of_files = glob.glob(filepath+'*')
+    print list_of_files
+    latest_file = max(list_of_files, key=os.path.getctime)
+    return latest_file
+
+class FilterModule(object):
+    ''' A filter to fetch latest file '''
+    def filters(self):
+        return {
+            'get_inv_file': get_inv_file
+        }

config/Dockerfiles/linchpin-libvirt/linchpin_workspace/topologies/example-topology.yml

@@ -6,28 +6,54 @@
   tasks:
     - name: "Pause for a while for dhcp to catch up"
       pause: 
-        minutes: 2
+        minutes: 5
+    - name: "Get inventory file"
+      set_fact:
+        inv_file:  "{{ playbook_dir }}/../../../inventories/"
     - name: "cat inventory out generated inventory"
-      shell: "cat /root/linchpin_workspace/inventories/libvirt.inventory"
+      shell: "cat {{ inv_file | get_inv_file }}"
       register: inventory_output
     - name: "debug: inventory get first ip address in inventory"
       debug:
         msg: "{{ inventory_output.stdout | get_first_ip }}"
     - name: "Set fact for ip_address"
       set_fact:
         ipaddr: "{{ inventory_output.stdout | get_first_ip  }}"
+    - name: "Generate single node deployment inventory"
+      template:
+        src: singlenode.j2
+        dest: /tmp/singlenode.inv
+    - name: "List out running vms"
+      virt:
+        command: list_vms
+      register: out
+    - debug:
+        msg: "{{ out }}"
+    - name: "destroy the vm domains"
+      virt:
+        command: destroy
+        name: "{{ item }}"
+      with_items: 
+        - "{{ out['list_vms'] }}"
+    - name: "Pause a min for stablizing dhcp"
+      pause:
+        minutes: 1
+    - name: "restart the vm domains"
+      virt:
+        command: start
+        name: "{{ item }}"
+      with_items: 
+        - "{{ out['list_vms'] }}"
     - name: "enable the network service"
-      shell: "ansible -i /root/linchpin_workspace/inventories/libvirt.inventory all -u admin --become --private-key ~/.ssh/ex -a\"systemctl enable network\""
+      shell: "ansible -i {{ inv_file | get_inv_file }} all -u admin --become --private-key ~/.ssh/ex -a\"systemctl enable network\""
       environment:
         ANSIBLE_HOST_KEY_CHECKING: False
+      ignore_errors: yes
     - name: "Start the network service"
-      shell: "ansible -i /root/linchpin_workspace/inventories/libvirt.inventory all -u admin --become --private-key ~/.ssh/ex -a\"systemctl start network\""
+      shell: "ansible -i {{ inv_file | get_inv_file }} all -u admin --become --private-key ~/.ssh/ex -a\"systemctl start network\""
       environment:
         ANSIBLE_HOST_KEY_CHECKING: False
-    #- name: "Add ip to /etc/hosts file "
-    #  shell: ansible -i localhost  localhost -m lineinfile  -a"line='{{ ipaddr }} atomic01 atomic01.example.com' destfile='/etc/hosts' state='present'"
-    #  environment:
-    #    ANSIBLE_HOST_KEY_CHECKING: False
+      ignore_errors: yes
     - name: "Copy hosts file to tmp"
       copy:
         src: /etc/hosts
@@ -39,16 +65,12 @@
         destfile: "/tmp/hosts"
         state: "present"
     - name: "Copy hosts file to /etc/"
-      shell: "cat /tmp/hosts > /etc/hosts"                                                                                                                                                                                               
+      shell: "cat /tmp/hosts > /etc/hosts"                                                                  
     - name: "Add ip to /etc/hosts file"
-      shell: ansible -i /root/linchpin_workspace/inventories/libvirt.inventory all -u admin --become --private-key ~/.ssh/ex -m lineinfile -a"line='{{ ipaddr }} atomic01 atomic01.example.com' destfile='/etc/hosts' state='present'"
+      shell: ansible -i {{ inv_file | get_inv_file }} all -u admin --become --private-key ~/.ssh/ex -m lineinfile -a"line='{{ ipaddr }} atomic01 atomic01.example.com' destfile='/etc/hosts' state='present'"
       environment:
         ANSIBLE_HOST_KEY_CHECKING: False
     - name: "Use ansible adhoc command to hostnamectl set-hostname to atomic01.example.com"
-      shell: "ansible -i /root/linchpin_workspace/inventories/libvirt.inventory all -u admin --become --private-key ~/.ssh/ex -a \"hostnamectl set-hostname atomic01.example.com\""
+      shell: "ansible -i {{ inv_file | get_inv_file }} all -u admin --become --private-key ~/.ssh/ex -a \"hostnamectl set-hostname atomic01.example.com\""
       environment:
         ANSIBLE_HOST_KEY_CHECKING: False
-    - name: "Generate single node deployment inventory"
-      template:
-        src: singlenode.j2
-        dest: /tmp/singlenode.inv

config/Dockerfiles/linchpin-libvirt/linchpin_workspace15/PinFile

@@ -2,6 +2,9 @@
 - hosts: localhost
   connection: local
   tasks:
+    - name: "Pause for a while to debug the state"
+      pause:
+        minutes: 15
     - name: "Install openshift"
       shell: ansible-playbook -i /tmp/singlenode.inv --private-key /root/.ssh/ex /root/linchpin_workspace/hooks/ansible/openshift-ansible/playbooks/byo/config.yml -e'openshift_disable_check=disk_availability,docker_storage,memory_availability' -e 'ansible_python_interpreter=/usr/bin/python3'
       register: openshift_out

config/Dockerfiles/linchpin-libvirt/linchpin_workspace/hooks/ansible/generate_openshift_inv/filter_plugins/get_first_ip.py config/Dockerfiles/linchpin-libvirt/linchpin_workspace15/hooks/ansible/generate_openshift_inv/filter_plugins/get_first_ip.py

@@ -0,0 +1,22 @@
+#!/bin/sh -x
+
+su - -c "echo Running as Username $USER"
+echo "Inserting img_src"
+img_src=$(find /workDir/workspace -name "untested-atomic.qcow2" | tail -n 1)
+sed -i "s|        image_src\:.*|        image_src\: \"file\:\/\/$img_src\"|" /root/linchpin_workspace/topologies/example-topology.yml
+su - -c "mkdir ~/.ssh"
+
+retries=3
+
+for ((i=0; i<retries; i++)); do
+    echo "Running linchpin up inside libvirt container"
+    su - -c "linchpin -v -w /root/linchpin_workspace up" && su - -c "linchpin -v -w /root/linchpin_workspace drop" 
+    [[ $? -eq 0 ]] && break
+
+    echo "something went wrong, let's wait 20 seconds and retry"
+    sleep 20
+done
+
+[[ $retries -eq i ]] && { echo "Failed!"; exit 1; }
+
+cat /tmp/e2e.log

config/Dockerfiles/linchpin-libvirt/linchpin_workspace15/hooks/ansible/generate_openshift_inv/filter_plugins/get_inv_file.py

@@ -0,0 +1,26 @@
+---
+topology_name: "libvirt"
+resource_groups:
+  - resource_group_name: "ex"
+    res_group_type: "libvirt"
+    res_defs:
+      - res_name: "f27test"
+        res_type: "libvirt_node"
+        uri: 'qemu:///system'
+        count: 1
+        image_src: "file:///home/output/images/untested-atomic.qcow2"
+        memory: 3096
+        vcpus: 2
+        arch: x86_64
+        network_bridge: 'virbr3'
+        networks:
+          - name: default
+        additional_storage: 10G
+        cloud_config:
+          users:
+            - name: admin
+              gecos: Admin User
+              groups: wheel
+              sudo: ALL=(ALL) NOPASSWD:ALL
+              ssh-import-id: None
+              lock_passwd: true