Merge pull request #143 from charlieok/update_vm_to_bullseye

Update vm to bullseye

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"

roles/common/defaults/main.yml

@@ -10,7 +10,7 @@ zcash_common_packages:
   - htop
   - ntp
   - ntpdate
-  - python-pip
+  - python3-pip
   - rsync
   - screen
   - sudo

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

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

roles/gitian/files/explode_yaml_file.py

@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
 # -*- coding: utf-8 -*-
 
 import argparse

roles/gitian/tasks/main.yml

@@ -23,7 +23,7 @@
       - lintian
       - lxc
       - make
-      - python-cheetah
+      - python3-cheetah
       - qemu-utils
       - ruby
       - sudo
@@ -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

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}