sikkienl/dash
1
0
Fork 0
mirror of https://github.com/dashpay/dash.git synced 2024-12-27 04:52:59 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge #13998: Scripts and tools: gitian-build.py improvements and corrections

Browse Source 
0f22a0cf2f Fix gitian-build.py --verify option (Hennadii Stepanov)
4c56a798c0 Set/unset USE_LXC, USE_VBOX, USE_DOCKER explicitly (Hennadii Stepanov)
cbbd98863b Fix Docker related issues for gitian-build.py (Hennadii Stepanov)

Pull request description:

  1. The Docker does not depend on `apt-cacher-ng` package. Ref: #14002.

  2. Do not try to install the Docker if `docker.service` is detected on the system (e.g., the Docker was installed manually). Fix https://github.com/bitcoin/bitcoin/pull/13623#issuecomment-405684241 by **Sjors**.

  3. Prevent the setting of more than one environment variable for the `gitian-builder` (an alternative to #13999). E.g., USE_LXC being set shadows USE_DOCKER; for details see [`gitian-builder/libexec/make-clean-vm`](93a62c7d7d/libexec/make-clean-vm (L7)):
  ```sh
  VMSW=KVM
  if [ -n "$USE_LXC" ]; then
      VMSW=LXC
  elif [ -n "$USE_VBOX" ]; then
      VMSW=VBOX
  elif [ -n "$USE_DOCKER" ]; then
      VMSW=DOCKER
  fi
  ```
  4. The [`gitian-builder/bin/gverify`](https://github.com/devrandom/gitian-builder/blob/master/bin/gverify) script returns the exit code 1 if a signature verification ends with 'BAD SIGNATURE' or 'MISMATCH' by design. This PR allows to see the verification results for all signatures without a premature fail of the `gitian-build.py` script. Ref: #14014.

ACKs for commit 0f22a0:

Tree-SHA512: 55f8a5cffa20d0c745f51a687f3199cea015fa616e56a0aee4c25b5ca0985036c61e8cf1922515338d8c6a85f873674ebe7a9a56a5069d65a187e383150f1a83
This commit is contained in:
MarcoFalke 2021-09-02 03:37:21 +03:00 committed by UdjinM6
parent 07a7fda225
commit f512e704d5
No known key found for this signature in database
GPG Key ID: 83592BD1400D58D9
1 changed files with 42 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

69
contrib/gitian-build.py
View File

@ -8,9 +8,7 @@ import sys
def setup(): def setup():
global args, workdir global args, workdir
programs = ['ruby', 'git', 'make', 'wget'] programs = ['ruby', 'git', 'make', 'wget']
if args.lxc: if args.kvm:
programs += ['apt-cacher-ng', 'lxc', 'debootstrap']
elif args.kvm:
programs += ['apt-cacher-ng', 'python-vm-builder', 'qemu-kvm', 'qemu-utils'] programs += ['apt-cacher-ng', 'python-vm-builder', 'qemu-kvm', 'qemu-utils']
elif args.docker and not os.path.isfile('/lib/systemd/system/docker.service'): elif args.docker and not os.path.isfile('/lib/systemd/system/docker.service'):
dockers = ['docker.io', 'docker-ce'] dockers = ['docker.io', 'docker-ce']
@ -19,8 +17,10 @@ def setup():
if return_code == 0: if return_code == 0:
break break
if return_code != 0: if return_code != 0:
print('Cannot find any way to install Docker', file=sys.stderr) print('Cannot find any way to install Docker.', file=sys.stderr)
exit(1) sys.exit(1)
else:
programs += ['apt-cacher-ng', 'lxc', 'debootstrap']
subprocess.check_call(['sudo', 'apt-get', 'install', '-qq'] + programs) subprocess.check_call(['sudo', 'apt-get', 'install', '-qq'] + programs)
if not os.path.isdir('gitian.sigs'): if not os.path.isdir('gitian.sigs'):
subprocess.check_call(['git', 'clone', 'https://github.com/dashpay/gitian.sigs.git']) subprocess.check_call(['git', 'clone', 'https://github.com/dashpay/gitian.sigs.git'])
@ -41,7 +41,7 @@ def setup():
if args.is_bionic and not args.kvm and not args.docker: if args.is_bionic and not args.kvm and not args.docker:
subprocess.check_call(['sudo', 'sed', '-i', 's/lxcbr0/br0/', '/etc/default/lxc-net']) subprocess.check_call(['sudo', 'sed', '-i', 's/lxcbr0/br0/', '/etc/default/lxc-net'])
print('Reboot is required') print('Reboot is required')
exit(0) sys.exit(0)
def build(): def build():
global args, workdir global args, workdir
@ -118,20 +118,36 @@ def sign():
def verify(): def verify():
global args, workdir global args, workdir
rc = 0
os.chdir('gitian-builder') os.chdir('gitian-builder')
print('\nVerifying v'+args.version+' Linux\n') print('\nVerifying v'+args.version+' Linux\n')
subprocess.call(['bin/gverify', '-v', '-d', '../gitian.sigs/', '-r', args.version+'-linux', '../dash/contrib/gitian-descriptors/gitian-linux.yml']) if subprocess.call(['bin/gverify', '-v', '-d', '../gitian.sigs/', '-r', args.version+'-linux', '../dash/contrib/gitian-descriptors/gitian-linux.yml']):
print('Verifying v'+args.version+' Linux FAILED\n')
rc = 1
print('\nVerifying v'+args.version+' Windows\n') print('\nVerifying v'+args.version+' Windows\n')
subprocess.call(['bin/gverify', '-v', '-d', '../gitian.sigs/', '-r', args.version+'-win-unsigned', '../dash/contrib/gitian-descriptors/gitian-win.yml']) if subprocess.call(['bin/gverify', '-v', '-d', '../gitian.sigs/', '-r', args.version+'-win-unsigned', '../dash/contrib/gitian-descriptors/gitian-win.yml']):
print('Verifying v'+args.version+' Windows FAILED\n')
rc = 1
print('\nVerifying v'+args.version+' MacOS\n') print('\nVerifying v'+args.version+' MacOS\n')
subprocess.call(['bin/gverify', '-v', '-d', '../gitian.sigs/', '-r', args.version+'-osx-unsigned', '../dash/contrib/gitian-descriptors/gitian-osx.yml']) if subprocess.call(['bin/gverify', '-v', '-d', '../gitian.sigs/', '-r', args.version+'-osx-unsigned', '../dash/contrib/gitian-descriptors/gitian-osx.yml']):
print('Verifying v'+args.version+' MacOS FAILED\n')
rc = 1
print('\nVerifying v'+args.version+' Signed Windows\n') print('\nVerifying v'+args.version+' Signed Windows\n')
subprocess.call(['bin/gverify', '-v', '-d', '../gitian.sigs/', '-r', args.version+'-win-signed', '../dash/contrib/gitian-descriptors/gitian-win-signer.yml']) if subprocess.call(['bin/gverify', '-v', '-d', '../gitian.sigs/', '-r', args.version+'-win-signed', '../dash/contrib/gitian-descriptors/gitian-win-signer.yml']):
print('Verifying v'+args.version+' Signed Windows FAILED\n')
rc = 1
print('\nVerifying v'+args.version+' Signed MacOS\n') print('\nVerifying v'+args.version+' Signed MacOS\n')
subprocess.call(['bin/gverify', '-v', '-d', '../gitian.sigs/', '-r', args.version+'-osx-signed', '../dash/contrib/gitian-descriptors/gitian-osx-signer.yml']) if subprocess.call(['bin/gverify', '-v', '-d', '../gitian.sigs/', '-r', args.version+'-osx-signed', '../dash/contrib/gitian-descriptors/gitian-osx-signer.yml']):
print('Verifying v'+args.version+' Signed MacOS FAILED\n')
rc = 1
os.chdir(workdir) os.chdir(workdir)
return rc
def main(): def main():
global args, workdir global args, workdir
@ -164,25 +180,24 @@ def main():
args.docker = (args.virtualization == 'docker') args.docker = (args.virtualization == 'docker')
script_name = os.path.basename(sys.argv[0]) script_name = os.path.basename(sys.argv[0])
# Set all USE_* environment variables for gitian-builder: USE_LXC, USE_DOCKER and USE_VBOX if not args.lxc and not args.kvm and not args.docker:
print(script_name+': Wrong virtualization option.')
print('Try '+script_name+' --help for more information')
sys.exit(1)
# Ensure no more than one environment variable for gitian-builder (USE_LXC, USE_VBOX, USE_DOCKER) is set as they
# can interfere (e.g., USE_LXC being set shadows USE_DOCKER; for details see gitian-builder/libexec/make-clean-vm).
os.environ['USE_LXC'] = ''
os.environ['USE_VBOX'] = '' os.environ['USE_VBOX'] = ''
if args.lxc: os.environ['USE_DOCKER'] = ''
if args.docker:
os.environ['USE_DOCKER'] = '1'
elif not args.kvm:
os.environ['USE_LXC'] = '1' os.environ['USE_LXC'] = '1'
os.environ['USE_DOCKER'] = ''
if 'GITIAN_HOST_IP' not in os.environ.keys(): if 'GITIAN_HOST_IP' not in os.environ.keys():
os.environ['GITIAN_HOST_IP'] = '10.0.3.1' os.environ['GITIAN_HOST_IP'] = '10.0.3.1'
if 'LXC_GUEST_IP' not in os.environ.keys(): if 'LXC_GUEST_IP' not in os.environ.keys():
os.environ['LXC_GUEST_IP'] = '10.0.3.5' os.environ['LXC_GUEST_IP'] = '10.0.3.5'
elif args.kvm:
os.environ['USE_LXC'] = ''
os.environ['USE_DOCKER'] = ''
elif args.docker:
os.environ['USE_LXC'] = ''
os.environ['USE_DOCKER'] = '1'
else:
print(script_name+': Wrong virtualization option.')
print('Try '+script_name+' --help for more information')
exit(1)
if args.setup: if args.setup:
setup() setup()
@ -203,11 +218,11 @@ def main():
if not args.signer: if not args.signer:
print(script_name+': Missing signer') print(script_name+': Missing signer')
print('Try '+script_name+' --help for more information') print('Try '+script_name+' --help for more information')
exit(1) sys.exit(1)
if not args.version: if not args.version:
print(script_name+': Missing version') print(script_name+': Missing version')
print('Try '+script_name+' --help for more information') print('Try '+script_name+' --help for more information')
exit(1) sys.exit(1)
# Add leading 'v' for tags # Add leading 'v' for tags
if args.commit and args.pull: if args.commit and args.pull:
@ -240,7 +255,7 @@ def main():
os.chdir('gitian.sigs') os.chdir('gitian.sigs')
subprocess.check_call(['git', 'pull']) subprocess.check_call(['git', 'pull'])
os.chdir(workdir) os.chdir(workdir)
verify() sys.exit(verify())
if __name__ == '__main__': if __name__ == '__main__':
main() main()