From 0ce6182f9eb09401b5edd507aedb6fed7ce17263 Mon Sep 17 00:00:00 2001 From: Charlie O'Keefe Date: Sun, 24 Mar 2019 15:53:41 -0600 Subject: [PATCH 1/2] Update zcash-build vm debian release from jessie to stretch --- Vagrantfile | 2 +- roles/common/files/50unattended-upgrades | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Vagrantfile b/Vagrantfile index 46dba57..2d1c815 100644 --- a/Vagrantfile +++ b/Vagrantfile @@ -5,7 +5,7 @@ Vagrant.configure(2) do |config| config.ssh.forward_agent = true config.disksize.size = '16GB' config.vm.define 'zcash-build', autostart: false do |gitian| - gitian.vm.box = "debian/jessie64" + gitian.vm.box = "debian/stretch64" gitian.vm.network "forwarded_port", guest: 22, host: 2200, auto_correct: true gitian.vm.provision "ansible" do |ansible| ansible.playbook = "gitian.yml" diff --git a/roles/common/files/50unattended-upgrades b/roles/common/files/50unattended-upgrades index 5d19d2d..aaf7722 100644 --- a/roles/common/files/50unattended-upgrades +++ b/roles/common/files/50unattended-upgrades @@ -1,6 +1,6 @@ Unattended-Upgrade::Origins-Pattern { - "o=Debian,n=jessie-updates"; - "o=Debian,n=jessie,l=Debian-Security"; + "o=Debian,n=stretch-updates"; + "o=Debian,n=stretch,l=Debian-Security"; }; Unattended-Upgrade::Remove-Unused-Dependencies "true"; Unattended-Upgrade::Automatic-Reboot "false"; From 60c6dea2915d78597dcdd2c3edcfc599157e8b3f Mon Sep 17 00:00:00 2001 From: Charlie O'Keefe Date: Sun, 24 Mar 2019 15:57:30 -0600 Subject: [PATCH 2/2] Install lxc from standard apt repository rather than backports --- roles/gitian/tasks/main.yml | 14 +------------- 1 file changed, 1 insertion(+), 13 deletions(-) diff --git a/roles/gitian/tasks/main.yml b/roles/gitian/tasks/main.yml index 09f5129..1c80832 100644 --- a/roles/gitian/tasks/main.yml +++ b/roles/gitian/tasks/main.yml @@ -24,6 +24,7 @@ - gnupg2 - kpartx - lintian + - lxc - make - python-cheetah - qemu-utils @@ -107,19 +108,6 @@ group: root mode: "0644" -- name: Set up jessie-backports. - apt_repository: - repo: 'deb http://httpredir.debian.org/debian/ jessie-backports main' - state: present - -- name: Install updated version of LXC. - apt: - name: lxc - state: latest - default_release: jessie-backports - update_cache: yes - cache_valid_time: 3600 - - name: Clone git repository for Gitian builder. git: repo: "{{ gitian_builder_url }}"