Merge pull request #928 from cevich/fix_missing_fedora_dep

integration-playbook: Add hidden dependencies

contrib/test/crio-integration-playbook.yaml

@@ -1,12 +1,67 @@
 ## This playbook expects --extra-vars "commit=<commit>"
 ## and either --extra-vars "pullrequest=<PR #>" or
-## --skip-tags pr
+## --skip-tags pr.
+##
+## Required: --extra-vars extras_repo_baseurl=<HTTP or HTTPS>
 - hosts: all
   remote_user: root
+  gather_facts: False  # Ansible dependencies need installing first
   vars:
     xunit: false
     cni_commit: dcf7368eeab15e2affc6256f0bb1e84dd46a34de
+    integration_timeout_seconds: "{{ 60 * 60 * 2 }}"
+  pre_tasks:
+    # Assert subscription stuff won't get in the way
+    - assert:
+        that:
+          - 'extras_repo_baseurl | default(False)'
+          - 'server_repo_baseurl | default(False)'
+    - name: Install pre-requesites for ansible on all platforms
+      raw: $(type -P dnf || type -P yum) install -y python libselinux-python yum-utils python3-pycurl
+    # Gather facts
+    - setup:
+    # Just one more thing...
+    - name: Install special ansible deps. for fedora
+      raw: dnf install -y python2-dnf python3-dnf
+      when: ansible_distribution == 'Fedora'
   tasks:
+  - name: Enable EPEL on RHEL & CentOS
+    yum_repository:
+      name: epel
+      description: "Extra Packages for Enterprise Linux"
+      baseurl: "http://dl.fedoraproject.org/pub/epel/7/$basearch"
+      metalink: "https://mirrors.fedoraproject.org/metalink?repo=epel-7&arch=$basearch"
+      enabled: True
+      gpgcheck: True
+      gpgcakey: "https://dl.fedoraproject.org/pub/epel/RPM-GPG-KEY-EPEL-7Server"
+    when: (ansible_distribution == 'RedHat' or ansible_distribution == 'CentOS')
+  - name: import EPEL GPG keys on RHEL & CentOS
+    command: 'rpm --import {{ item }}'
+    with_items:
+      - https://dl.fedoraproject.org/pub/epel/RPM-GPG-KEY-EPEL-7Server
+      - https://dl.fedoraproject.org/pub/epel/RPM-GPG-KEY-EPEL-7
+      - https://dl.fedoraproject.org/pub/epel/RPM-GPG-KEY-EPEL
+    when: (ansible_distribution == 'RedHat' or ansible_distribution == 'CentOS')
+  - name: Enable required RHEL repositories
+    yum_repository:
+      name: "{{ item.key }}"
+      description: Required repo. for RHEL
+      baseurl: "{{ item.value }}"
+      gpgcheck: False
+      enabled: True
+    with_dict:
+      extras: '{{ extras_repo_baseurl | mandatory }}'
+      server: '{{ server_repo_baseurl | mandatory }}'
+    when: (ansible_distribution == 'RedHat')
+  - name: Don't let old cache interfere with new efforts
+    shell: $(type -P dnf || type -P yum) clean all && rm -rf /var/cache/{yum,dnf}
+  - name: disable redhat yum plugin
+    ini_file:
+      path: "/etc/yum/pluginconf.d/subscription-manager.conf"
+      section: main
+      option: enabled
+      value: 0
+    when: (ansible_distribution == 'RedHat')
   - name: Update all packages
     yum:
       name: '*'
@@ -27,28 +82,57 @@
       name: "{{ item }}"
       state: latest
     with_items:
-      - wget
-      - git
-      - make
-      - gcc
-      - tar
-      - libseccomp-devel
-      - golang
-      - glib2-devel
-      - glibc-static
-      - container-selinux
       - btrfs-progs-devel
-      - device-mapper-devel
-      - ostree-devel
-      - glibc-devel
-      - gpgme-devel
-      - libassuan-devel
-      - libgpg-error-devel
-      - pkgconfig
+      - container-selinux
       - skopeo-containers
-      - oci-systemd-hook
+      - curl
+      - device-mapper-devel
+      - expect
+      - findutils
+      - gcc
+      - git
+      - glib2-devel
+      - glibc-devel
+      - glibc-static
+      - golang
+      - gpgme-devel
+      - hostname
+      - iproute
+      - iptables
+      - krb5-workstation
+      - libassuan-devel
+      - libffi-devel
+      - libgpg-error-devel
+      - libguestfs-tools
+      - libseccomp-devel
+      - libvirt-client
+      - libvirt-python
+      - libxml2-devel
+      - libxslt-devel
+      - make
+      - mlocate
+      - nfs-utils
+      - nmap-ncat
+      - npm
       - oci-register-machine
+      - oci-systemd-hook
       - oci-umount
+      - openssl
+      - openssl-devel
+      - ostree-devel
+      - pkgconfig
+      - python
+      - python2-boto
+      - python2-crypto
+      - python2-mock
+      - python-click
+      - python-devel
+      - python-virtualenv
+      - PyYAML
+      - redhat-rpm-config
+      - rpcbind
+      - rsync
+      - sed
       - socat
     async: 600
     poll: 10
@@ -58,6 +142,8 @@
       name: "{{ item }}"
       state: latest
     with_items:
+      - nmap-ncat
+      - iptables
       - wget
       - git
       - make
@@ -264,6 +350,7 @@
       regexp: 'export PATH=/usr/local/go/bin:$PATH'
       state: present
     when: ansible_distribution == 'Fedora' or ansible_distribution == 'RedHat'
+  # dest dir depends on skopeo-containers package
   - name: Copy redhat sigstore file to test host
     copy:
       remote_src: yes
@@ -278,7 +365,7 @@
     shell: 'CGROUP_MANAGER=cgroupfs STORAGE_OPTS="--storage-driver=overlay2 --storage-opt overlay2.override_kernel_check=1" make localintegration 2>&1 > testout.txt'
     args:
       chdir: /root/src/github.com/kubernetes-incubator/cri-o
-    async: 3600
+    async: "{{ integration_timeout_seconds | int }}"
     poll: 10
     ignore_errors: yes
     when: ansible_distribution == 'RedHat' or ansible_distribution == 'CentOS'
@@ -286,7 +373,7 @@
     shell: 'CGROUP_MANAGER=cgroupfs STORAGE_OPTS="--storage-driver=overlay2 --storage-opt overlay2.override_kernel_check=1" make localintegration'
     args:
       chdir: /root/src/github.com/kubernetes-incubator/cri-o
-    async: 3600
+    async: "{{ integration_timeout_seconds | int }}"
     poll: 10
     ignore_errors: yes
     when: (ansible_distribution == 'RedHat' or ansible_distribution == 'CentOS') and xunit
@@ -294,7 +381,7 @@
     shell: 'CGROUP_MANAGER=cgroupfs STORAGE_OPTS="--storage-driver=overlay2" make localintegration 2>&1 > testout.txt'
     args:
       chdir: /root/src/github.com/kubernetes-incubator/cri-o
-    async: 3600
+    async: "{{ integration_timeout_seconds | int }}"
     poll: 10
     ignore_errors: yes
     when: ansible_distribution == 'Fedora'
@@ -302,7 +389,7 @@
     shell: 'CGROUP_MANAGER=cgroupfs STORAGE_OPTS="--storage-driver=overlay2" make localintegration'
     args:
       chdir: /root/src/github.com/kubernetes-incubator/cri-o
-    async: 3600
+    async: "{{ integration_timeout_seconds | int }}"
     poll: 10
     ignore_errors: yes
     when: (ansible_distribution == 'Fedora' and xunit)

contrib/test/venv-ansible-playbook.sh

@@ -56,6 +56,8 @@ echo
 (
     set -x
     cd "$WORKSPACE"
+    # When running more than once, make it fast by skipping the bootstrap
+    if [ ! -d "./.cri-o_venv" ]; then
         # N/B: local system's virtualenv binary - uncontrolled version fixed below
         virtualenv --no-site-packages --python=python2.7 ./.venvbootstrap
         # Set up paths to install/operate out of $WORKSPACE/.venvbootstrap
@@ -76,7 +78,7 @@ echo
         ./.venvbootstrap/bin/virtualenv --no-site-packages --python=python2.7 ./.cri-o_venv
         # Exit untrusted virtualenv
         deactivate
-
+    fi
     # Enter trusted virtualenv
     source ./.cri-o_venv/bin/activate
     # Re-install from cache