Commit 55793bf7 authored by intrigeri's avatar intrigeri
Browse files

Merge branch 'bugfix/17398-follow-up-to-15281' into stable

parents 0b39066f 8414a51b
......@@ -19,8 +19,8 @@ def main():
description="Copy IUKs from Jenkins to our rsync server \
and verify that they match those built locally"
)
parser.add_argument("--hashes-file", type=str, action="store")
parser.add_argument("--jenkins-build-id", type=int, action="store")
parser.add_argument("--hashes-file", type=str, action="store", required=True)
parser.add_argument("--jenkins-build-id", type=int, action="store", required=True)
parser.add_argument("-q", "--quiet", action="store_true",
help="quiet output")
parser.add_argument("--debug", action="store_true", help="debug output")
......@@ -31,22 +31,11 @@ def main():
args = parser.parse_args()
if args.debug:
logging.basicConfig(level=logging.DEBUG, stream=sys.stderr,
format=LOG_FORMAT)
logging.basicConfig(level=logging.DEBUG, format=LOG_FORMAT)
elif args.quiet:
logging.basicConfig(level=logging.WARN, stream=sys.stderr,
format=LOG_FORMAT)
logging.basicConfig(level=logging.WARN, format=LOG_FORMAT)
else:
logging.basicConfig(level=logging.INFO, stream=sys.stderr,
format=LOG_FORMAT)
if args.hashes_file is None:
log.error("Please pass --hashes-file")
sys.exit(1)
if args.jenkins_build_id is None:
log.error("Please pass --jenkins-build-id")
sys.exit(1)
logging.basicConfig(level=logging.INFO, format=LOG_FORMAT)
if not Path(args.hashes_file).exists():
log.error("%s does not exist" % (args.hashes_file))
......@@ -127,8 +116,4 @@ def verify_iuks(desthost: str, hashes_file: str) -> None:
if __name__ == "__main__":
try:
sys.exit(main())
except Exception as e:
print(e, file=sys.stderr)
sys.exit(1)
main()
......@@ -13,7 +13,7 @@ Requirements
To release Tails you'll need some packages installed:
* `hopenpgp-tools tidy mktorrent transmission-cli`
* `tidy mktorrent transmission-cli`
* aufs DKMS module for your running kernel.
* [[!debpts squashfs-tools]] 1:4.4-1+0.tails1
from our custom `iukbuilder-stretch` APT suite.
......@@ -797,7 +797,7 @@ running version. If this is news to you, see:
* the corresponding
[[design documentation|contribute/design/incremental_upgrades]].
The main practical implications are release time are:
The main practical implications at release time are:
* The Release Manager has to publish more IUKs than they used to.
But they can now publish IUKs (reproducibly) built on Jenkins,
......
......@@ -44,7 +44,9 @@ Install dependencies needed to generate IUKs, UDFs, and to run the test suite
Run the test suite
==================
Prepare your environment:
Prepare your environment (which includes getting a `sudo` authentication token,
that's needed by the test suite, and setting a `umask` that runs the tests in
conditions closer to production):
export SOURCE_DATE_EPOCH=$(date --utc +%s)
sudo true
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment