Merge pull request #4126 from freedomofpress/fix-upgrade-scenario

Fix upgrade scenario
freedomofpress · Feb 12, 2019 · 8ebbfdb · 8ebbfdb
2 parents c8db4a7 + 2b5aefe
commit 8ebbfdb
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 2 deletions.
diff --git a/molecule/upgrade/ansible-override-vars.yml b/molecule/upgrade/ansible-override-vars.yml
@@ -10,6 +10,7 @@ monitor_ip: "{{ hostvars['mon-staging']['ansible_'+primary_network_iface].ipv4.a
 monitor_hostname: "{{ hostvars['mon-staging'].ansible_hostname }}"
 app_ip: "{{ hostvars['app-staging']['ansible_'+primary_network_iface].ipv4.address }}"
 app_hostname: "{{ hostvars['app-staging'].ansible_hostname }}"
+tor_apt_repo_url: "https://tor-apt.freedom.press"
 
 etc_hosts:
   app-staging:

diff --git a/molecule/upgrade/local_apt_with_debs.yml b/molecule/upgrade/local_apt_with_debs.yml
@@ -6,7 +6,7 @@
 
 - name: Copy over debs
   synchronize:
-    src: "{{ molecule_dir }}/../../build/"
+    src: "{{ molecule_dir }}/../../build/trusty/"
     dest: /var/repos/debs/
     delete: yes
 

diff --git a/molecule/upgrade/playbook.yml b/molecule/upgrade/playbook.yml
@@ -13,7 +13,7 @@
 
     - name: Find local deb files
       find:
-        paths: "{{ molecule_dir }}/../../build/"
+        paths: "{{ molecule_dir }}/../../build/trusty/"
         patterns: "*.deb"
       register: _upgrade_scenario_find_debs_result
       when: not QA_APTTEST