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

Build bionic base image in Jenkinsfile.gitian & update docs (#2226)

Browse Source 
* Build bionic base image in Jenkinsfile.gitian

We updated gitian builds to use bionic, so we should also update the Jenkinsfile

* Update docs
This commit is contained in:
Alexander Block 2018-08-14 21:36:15 +02:00 committed by UdjinM6
parent 50eb98d901
commit 3d654b9814
3 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Jenkinsfile.gitian
View File

@ -88,7 +88,7 @@ for(int i = 0; i < targets.size(); i++) {
} }
stage("${target}/base-vm") { stage("${target}/base-vm") {
dir('gitian-builder') { dir('gitian-builder') {
sh "./bin/make-base-vm --suite trusty --arch amd64 --docker" sh "./bin/make-base-vm --suite bionic --arch amd64 --docker"
} }
} }

2
contrib/gitian-descriptors/README.md
View File

@ -26,7 +26,7 @@ Once you've got the right hardware and software:
# Create base images # Create base images
cd gitian-builder cd gitian-builder
bin/make-base-vm --suite trusty --arch amd64 bin/make-base-vm --suite bionic --arch amd64
cd .. cd ..
# Get inputs (see doc/release-process.md for exact inputs needed and where to get them) # Get inputs (see doc/release-process.md for exact inputs needed and where to get them)

14
doc/gitian-building.md
View File

@ -326,7 +326,7 @@ Execute the following as user `debian`:
```bash ```bash
cd gitian-builder cd gitian-builder
bin/make-base-vm --lxc --arch amd64 --suite trusty bin/make-base-vm --lxc --arch amd64 --suite bionic
``` ```
There will be a lot of warnings printed during the build of the image. These can be ignored. There will be a lot of warnings printed during the build of the image. These can be ignored.
@ -378,7 +378,7 @@ Output from `gbuild` will look something like
Resolving deltas: 100% (41590/41590), done. Resolving deltas: 100% (41590/41590), done.
From https://github.com/dashpay/dash From https://github.com/dashpay/dash
... (new tags, new branch etc) ... (new tags, new branch etc)
--- Building for trusty amd64 --- --- Building for bionic amd64 ---
Stopping target if it is up Stopping target if it is up
Making a new image copy Making a new image copy
stdin: is not a tty stdin: is not a tty
@ -427,14 +427,14 @@ So, if you use LXC:
export PATH="$PATH":/path/to/gitian-builder/libexec export PATH="$PATH":/path/to/gitian-builder/libexec
export USE_LXC=1 export USE_LXC=1
cd /path/to/gitian-builder cd /path/to/gitian-builder
./libexec/make-clean-vm --suite trusty --arch amd64 ./libexec/make-clean-vm --suite bionic --arch amd64
LXC_ARCH=amd64 LXC_SUITE=trusty on-target -u root apt-get update LXC_ARCH=amd64 LXC_SUITE=bionic on-target -u root apt-get update
LXC_ARCH=amd64 LXC_SUITE=trusty on-target -u root \ LXC_ARCH=amd64 LXC_SUITE=bionic on-target -u root \
-e DEBIAN_FRONTEND=noninteractive apt-get --no-install-recommends -y install \ -e DEBIAN_FRONTEND=noninteractive apt-get --no-install-recommends -y install \
$( sed -ne '/^packages:/,/[^-] .*/ {/^- .*/{s/"//g;s/- //;p}}' ../dash/contrib/gitian-descriptors/*|sort|uniq ) $( sed -ne '/^packages:/,/[^-] .*/ {/^- .*/{s/"//g;s/- //;p}}' ../dash/contrib/gitian-descriptors/*|sort|uniq )
LXC_ARCH=amd64 LXC_SUITE=trusty on-target -u root apt-get -q -y purge grub LXC_ARCH=amd64 LXC_SUITE=bionic on-target -u root apt-get -q -y purge grub
LXC_ARCH=amd64 LXC_SUITE=trusty on-target -u root -e DEBIAN_FRONTEND=noninteractive apt-get -y dist-upgrade LXC_ARCH=amd64 LXC_SUITE=bionic on-target -u root -e DEBIAN_FRONTEND=noninteractive apt-get -y dist-upgrade
``` ```
And then set offline mode for apt-cacher-ng: And then set offline mode for apt-cacher-ng: