Merge pull request #3572 from edx/george/test-ficus-devstack

Preparation for Ficus devstack release

playbooks/roles/browsers/defaults/main.yml

 browser_deb_pkgs:
     - dbus-x11
-    - firefox=45.0.2+build1-0ubuntu1
+    - firefox
     - google-chrome-stable
     - libcurl3
     - libgconf2-4
@@ -9,6 +9,9 @@ browser_deb_pkgs:
     - xdg-utils
     - xvfb
 
+# Firefox
+firefox_version: version 45.*
+
 # Chrome and ChromeDriver
 chrome_repo: "deb [arch=amd64] http://dl.google.com/linux/chrome/deb/ stable main"
 chromedriver_version: 2.25

playbooks/roles/browsers/tasks/main.yml

@@ -5,70 +5,133 @@
   apt_key:
     url: "https://dl-ssl.google.com/linux/linux_signing_key.pub"
     state: present
+  tags:
+    - install
+    - install:system-requirements
 
 - name: add Google Chrome repo to the sources list
   apt_repository:
     repo: "{{ chrome_repo }}"
     state: present
+  tags:
+    - install
+    - install:system-requirements
+
+- name: lock Firefox version
+  copy:
+    dest: /etc/apt/preferences.d/firefox-pinned-version
+    content: |
+      Package: firefox
+      Pin: {{ firefox_version }}
+      Pin-Priority: 1001
+  tags:
+    - install
+    - install:system-requirements
 
 - name: install system packages
-  apt: pkg={{','.join(browser_deb_pkgs)}}
-       state=present update_cache=yes
+  apt:
+    name: "{{ item }}"
+    update_cache: yes
+  with_items: "{{ browser_deb_pkgs }}"
+  tags:
+    - install
+    - install:system-requirements
 
 - name: download ChromeDriver
   get_url:
     url={{ chromedriver_url }}
     dest=/var/tmp/chromedriver_{{ chromedriver_version }}.zip
   register: download_chromedriver
+  tags:
+    - install
+    - install:system-requirements
 
 - name: unzip ChromeDriver tarfile
   shell: unzip /var/tmp/chromedriver_{{ chromedriver_version }}.zip
          chdir=/var/tmp
   when: download_chromedriver.changed
+  tags:
+    - install
+    - install:system-requirements
 
 - name: move ChromeDriver binary to /usr/local
   shell: mv /var/tmp/chromedriver /usr/local/bin/chromedriver
   when: download_chromedriver.changed
+  tags:
+    - install
+    - install:system-requirements
 
 - name: make ChromeDriver binary executable
   file: path=/usr/local/bin/chromedriver mode=0755
   when: download_chromedriver.changed
+  tags:
+    - install
+    - install:system-requirements
 
 - name: verify ChromeDriver location and mode
   stat: path=/usr/local/bin/chromedriver
   register: chromedriver
+  tags:
+    - install
+    - install:system-requirements
+
 - assert:
     that:
       - "chromedriver.stat.exists"
       - "chromedriver.stat.mode == '0755'"
+  tags:
+    - install
+    - install:system-requirements
 
 - name: download PhantomJS
   get_url:
     url: "{{ phantomjs_url }}"
     dest: "/var/tmp/{{ phantomjs_tarfile }}"
   register: download_phantom_js
+  tags:
+    - install
+    - install:system-requirements
 
 - name: unpack the PhantomJS tarfile
   shell: "tar -xjf /var/tmp/{{ phantomjs_tarfile }}"
   args:
     chdir: "/var/tmp"
   when: download_phantom_js.changed
+  tags:
+    - install
+    - install:system-requirements
 
 - name: move PhantomJS binary to /usr/local
   shell: mv /var/tmp/{{ phantomjs_version }}/bin/phantomjs /usr/local/bin/phantomjs
   when: download_phantom_js.changed
+  tags:
+    - install
+    - install:system-requirements
 
 - name: verify phantomjs location
   stat: path=/usr/local/bin/phantomjs
   register: phantomjs
+  tags:
+    - install
+    - install:system-requirements
+
 - assert:
     that: "phantomjs.stat.exists"
+  tags:
+    - install
+    - install:system-requirements
 
 - name: create xvfb systemd service
   template: src=xvfb.service.j2 dest=/etc/systemd/system/xvfb.service owner=root group=root
+  tags:
+    - install
+    - install:configuration
 
-- name: register xvfb systemd service
-  shell: systemctl enable /etc/systemd/system/xvfb.service
-
-- name: start xvfb
-  service: name=xvfb state=started
+- name: enable and start xvfb systemd service
+  systemd:
+    name: xvfb
+    enabled: yes
+    state: started
+  tags:
+    - install
+    - install:configuration

vagrant/release/devstack/Vagrantfile

-Vagrant.require_version ">= 1.6.5"
+Vagrant.require_version ">= 1.8.7"
 unless Vagrant.has_plugin?("vagrant-vbguest")
   raise "Please install the vagrant-vbguest plugin by running `vagrant plugin install vagrant-vbguest`"
 end
@@ -44,6 +44,7 @@ end
 # to a name and a file path, which are used for retrieving
 # a Vagrant box from the internet.
 openedx_releases = {
+  "ned/test-ficus.2" => "ned-test-ficus-devstack-2016-12-20",
   "open-release/eucalyptus.master" => "eucalyptus-devstack-2016-09-01",
   "open-release/eucalyptus.1rc2" => "eucalyptus-devstack-2016-08-19",
   "open-release/eucalyptus.1" => "eucalyptus-devstack-2016-08-19",