From 6dc442a4c58597270a65d62373ceb22de7bd780e Mon Sep 17 00:00:00 2001 From: Charlie O'Keefe Date: Tue, 5 Apr 2022 00:17:15 -0600 Subject: [PATCH 1/7] Update VM image from buster to bullseye --- Vagrantfile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Vagrantfile b/Vagrantfile index b3af467..c0abe74 100644 --- a/Vagrantfile +++ b/Vagrantfile @@ -10,8 +10,8 @@ Vagrant.configure(2) do |config| config.ssh.forward_agent = true config.disksize.size = '32GB' config.vm.define 'zcash-build', autostart: false do |gitian| - gitian.vm.box = "debian/buster64" - gitian.vm.box_version = "10.20210829.1" + gitian.vm.box = "debian/bullseye64" + gitian.vm.box_version = "11.20220328.1" gitian.vm.network "forwarded_port", guest: 22, host: 2200, auto_correct: true gitian.vm.provision "ansible" do |ansible| ansible.playbook = "gitian.yml" From 3c82cdb592e779ba2ad56cafd1c49704204ce880 Mon Sep 17 00:00:00 2001 From: Charlie O'Keefe Date: Tue, 5 Apr 2022 00:19:02 -0600 Subject: [PATCH 2/7] python -> python3 in explode_yaml_file.py --- roles/gitian/files/explode_yaml_file.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/roles/gitian/files/explode_yaml_file.py b/roles/gitian/files/explode_yaml_file.py index 4168ef5..1e3ee82 100644 --- a/roles/gitian/files/explode_yaml_file.py +++ b/roles/gitian/files/explode_yaml_file.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python3 # -*- coding: utf-8 -*- import argparse From 9b448177a469d9bbc07b1a0ed8cea8b40e6eeae2 Mon Sep 17 00:00:00 2001 From: Charlie O'Keefe Date: Tue, 5 Apr 2022 00:18:20 -0600 Subject: [PATCH 3/7] python-pip -> python3-pip (package name update) --- roles/common/defaults/main.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/roles/common/defaults/main.yml b/roles/common/defaults/main.yml index efa97ea..101c373 100644 --- a/roles/common/defaults/main.yml +++ b/roles/common/defaults/main.yml @@ -10,7 +10,7 @@ zcash_common_packages: - htop - ntp - ntpdate - - python-pip + - python3-pip - rsync - screen - sudo From c319e932aaf477e4b9d0d06bb789e1b344bd411e Mon Sep 17 00:00:00 2001 From: Charlie O'Keefe Date: Tue, 5 Apr 2022 00:21:54 -0600 Subject: [PATCH 4/7] python-cheetah -> python3-cheetah (package name update) --- roles/gitian/tasks/main.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/roles/gitian/tasks/main.yml b/roles/gitian/tasks/main.yml index 013221f..13e1e16 100644 --- a/roles/gitian/tasks/main.yml +++ b/roles/gitian/tasks/main.yml @@ -23,7 +23,7 @@ - lintian - lxc - make - - python-cheetah + - python3-cheetah - qemu-utils - ruby - sudo From a76c528b355b077f30ddbb258cdd0472839cd0b5 Mon Sep 17 00:00:00 2001 From: Charlie O'Keefe Date: Tue, 5 Apr 2022 00:24:59 -0600 Subject: [PATCH 5/7] Remove VMBuilder download/install tasks --- roles/gitian/defaults/main.yml | 3 --- roles/gitian/tasks/main.yml | 17 ----------------- 2 files changed, 20 deletions(-) diff --git a/roles/gitian/defaults/main.yml b/roles/gitian/defaults/main.yml index e91e403..dde60d1 100644 --- a/roles/gitian/defaults/main.yml +++ b/roles/gitian/defaults/main.yml @@ -1,8 +1,5 @@ --- gitian_user: vagrant -download_directory: /tmp/gitian -vm_builder_name: 'vm-builder-0.12.4+bzr494' -vm_builder_url: 'http://archive.ubuntu.com/ubuntu/pool/universe/v/vm-builder/vm-builder_0.12.4+bzr494.orig.tar.gz' gitian_builder_url: "{{ lookup('env','GITIAN_BUILDER_URL') }}" gitian_builder_version: "{{ lookup('env','GITIAN_BUILDER_VERSION') }}" zcash_git_repo_url: https://github.com/zcash/zcash diff --git a/roles/gitian/tasks/main.yml b/roles/gitian/tasks/main.yml index 13e1e16..7079fdb 100644 --- a/roles/gitian/tasks/main.yml +++ b/roles/gitian/tasks/main.yml @@ -86,23 +86,6 @@ group: root mode: "0644" -- name: Create directory for downloaded files. - file: - state: directory - dest: "{{ download_directory }}" - mode: "0755" - -- name: Download and extract VM builder source code. - unarchive: - src: "{{ vm_builder_url }}" - dest: "{{ download_directory }}" - remote_src: yes - -- name: Install VM builder Python module. - command: "python setup.py install" - args: - chdir: "/tmp/gitian/{{ vm_builder_name }}" - - name: Install lxc-net configuration. template: src: lxc-net From 9d97146c157e227e477de8a718b62ad0ba2b4ee3 Mon Sep 17 00:00:00 2001 From: Charlie O'Keefe Date: Tue, 5 Apr 2022 09:43:16 -0600 Subject: [PATCH 6/7] Remove repartition tasks --- roles/common/tasks/repartition.yml | 36 ------------------------------ 1 file changed, 36 deletions(-) diff --git a/roles/common/tasks/repartition.yml b/roles/common/tasks/repartition.yml index b6489f2..9ce42e9 100644 --- a/roles/common/tasks/repartition.yml +++ b/roles/common/tasks/repartition.yml @@ -1,40 +1,4 @@ --- -- name: Make sure parted is installed - apt: - name: parted - state: present - update_cache: yes - -- name: Turn off all swap areas - command: swapoff -a - become: yes - -- name: Remove swap partition from /etc/fstab - mount: - path: none - fstype: swap - opts: sw - state: absent - -- name: Remove partition number 5 - parted: - device: /dev/sda - number: 5 - state: absent - -- name: Remove partition number 2 - parted: - device: /dev/sda - number: 2 - state: absent - register: rm_part_2_sda_info - -- name: Resize partition 1 to reach end of disk if it does not already - command: parted ---pretend-input-tty /dev/sda unit % resizepart 1 yes 100 - become: yes - when: rm_part_2_sda_info['disk']['size'] != rm_part_2_sda_info['partitions'][0]['end'] - register: parted_resize - - name: Resize filesystem on /dev/sda1 to fill the available space on the partition filesystem: dev: /dev/sda1 From a31e3d049b55b5881b7bccba1bed55fcff643c98 Mon Sep 17 00:00:00 2001 From: sasha Date: Thu, 7 Apr 2022 20:57:19 -0700 Subject: [PATCH 7/7] add "--fetch-tags" to work with gitian PR #245 --- roles/gitian/templates/gitian-build.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/roles/gitian/templates/gitian-build.sh b/roles/gitian/templates/gitian-build.sh index 4663244..dafca5c 100644 --- a/roles/gitian/templates/gitian-build.sh +++ b/roles/gitian/templates/gitian-build.sh @@ -216,7 +216,7 @@ then echo "Compiling variant: ${VERSION}_${suite}" echo "" - ./bin/gbuild -j ${proc} -m ${mem} --commit zcash=${COMMIT} --url zcash=${url} ${suite_dir_path}/gitian-linux.yml + ./bin/gbuild --fetch-tags -j ${proc} -m ${mem} --commit zcash=${COMMIT} --url zcash=${url} ${suite_dir_path}/gitian-linux.yml ./bin/gsign -p "$signProg" --signer "$SIGNER" --release ${VERSION}_${suite} --destination ${gitian_sigs_repo_path}/ ${suite_dir_path}/gitian-linux.yml suite_binaries_dir_path=${zcash_binaries_dir_path}/${VERSION}/${suite}