Merge "Fix: Correct docker-name for verify/release job"

[releng/builder.git] / packer / provision / mininet-ovs-2.8.yaml

diff --git a/packer/provision/mininet-ovs-2.8.yaml b/packer/provision/mininet-ovs-2.8.yaml
index 06dc8c011a323c4a7babdbfd809357dfc45962b2..ad887d87547c56dd69c7beb5f0fc1375f3380e09 100644 (file)
--- a/packer/provision/mininet-ovs-2.8.yaml
+++ b/packer/provision/mininet-ovs-2.8.yaml
@@ -5,14 +5,14 @@
   become_user: root
   become_method: sudo
   vars:
-    ovs_checksum: sha256:8d1c439e26d7044f0ec823c7fef1b00b7c6465da0b83a7d0cf3191ed1dc43893
-    ovs_version: 2.8.1
+    ovs_checksum: sha256:e40227e366db55f997344876a692918af68430bcb5fd3bd9ffe8dfd8c0bdd51f
+    ovs_version: 2.8.11
 
   pre_tasks:
     - include_role: name=lfit.system-update
 
   tasks:
-    - name: 'Install OpenVSwitch {{ovs_version}}'
+    - name: "Install OpenVSwitch {{ovs_version}}"
       block:
         - name: Install OpenVSwitch dependencies
           apt:
@@ -32,33 +32,33 @@
               - python-zopeinterface
             state: present
           become: true
-        - name: 'Fetch OpenVSwitch {{ovs_version}}'
+        - name: "Fetch OpenVSwitch {{ovs_version}}"
           get_url:
-            url: 'http://openvswitch.org/releases/openvswitch-{{ovs_version}}.tar.gz'
-            dest: '/tmp/openvswitch-{{ovs_version}}.tar.gz'
-            checksum: '{{ovs_checksum}}'
+            url: "http://openvswitch.org/releases/openvswitch-{{ovs_version}}.tar.gz"
+            dest: "/tmp/openvswitch-{{ovs_version}}.tar.gz"
+            checksum: "{{ovs_checksum}}"
         - name: Create /tmp/ovs directory
           file:
             path: /tmp/ovs
             state: directory
             mode: 0755
-        - name: 'Unarchive OpenVSwitch {{ovs_version}}'
+        - name: "Unarchive OpenVSwitch {{ovs_version}}"
           unarchive:
-            src: '/tmp/openvswitch-{{ovs_version}}.tar.gz'
+            src: "/tmp/openvswitch-{{ovs_version}}.tar.gz"
             dest: /tmp/ovs
             remote_src: true
-        - name: 'Build OpenVSwitch {{ovs_version}}'
+        - name: "Build OpenVSwitch {{ovs_version}}"
           shell: DEB_BUILD_OPTIONS='parallel=8 nocheck' fakeroot debian/rules binary
           args:
-            chdir: '/tmp/ovs/openvswitch-{{ovs_version}}'
-        - name: 'Install OpenVSwitch {{ovs_version}}'
-          apt: 'deb={{item}}'
+            chdir: "/tmp/ovs/openvswitch-{{ovs_version}}"
+        - name: "Install OpenVSwitch {{ovs_version}}"
+          apt: "deb={{item}}"
           with_items:
-            - /tmp/ovs/libopenvswitch_2.8.1-1_amd64.deb
-            - /tmp/ovs/openvswitch-common_2.8.1-1_amd64.deb
-            - /tmp/ovs/openvswitch-switch_2.8.1-1_amd64.deb
-            - /tmp/ovs/python-openvswitch_2.8.1-1_all.deb
-            - /tmp/ovs/openvswitch-vtep_2.8.1-1_amd64.deb
+            - /tmp/ovs/libopenvswitch_2.8.11-1_amd64.deb
+            - /tmp/ovs/openvswitch-common_2.8.11-1_amd64.deb
+            - /tmp/ovs/openvswitch-switch_2.8.11-1_amd64.deb
+            - /tmp/ovs/python-openvswitch_2.8.11-1_all.deb
+            - /tmp/ovs/openvswitch-vtep_2.8.11-1_amd64.deb
           become: true
         - name: Enable openvswitch-switch service
           systemd:
@@ -134,14 +134,14 @@
       apt: name=vlan state=present
       become: true
 
+    # This image is being used as a CSIT tools image and some of our
+    # CSIT test scripts are relying on python-2 and its request library.
+    # This makes sure we install them onto the image even though they
+    # are not required for the OVS rule of it.
     - name: Install CSIT dependencies
       apt:
         name:
-          - git-review
-          - python-chardet
-          - python-ndg-httpsclient
           - python-requests
-          - python-urllib3
         state: present
       become: true