[Date Prev][Date Next] [Thread Prev][Thread Next] [Date Index] [Thread Index]

[Git][ftp-team/dak][deploy] 9 commits: Add B-D on fakeroot as test fixtures need them (via dpkg-buildpackage call)

Title: GitLab

Ansgar Burchardt pushed to branch deploy at Debian FTP Team / dak

Commits:

7 changed files:

Changes:

  • config/debian/common
    ... ... @@ -95,7 +95,7 @@ function make_buildd_dir () {
    95 95 
         dak generate-packages-sources2 -a build-queues
    96 96 
         dak generate-releases -a build-queues >/dev/null
    97 97
    98 
    -    if [[ $archive = securiy ]]; then
    98 
    +    if [[ $archive = security ]]; then
    99 99 
             ${scriptsdir}/update-buildd-archive ${base}/build-queues ${incoming}/debian-security-buildd
    100 100 
             $configdir/cron.buildd
    101 101 
             sudo -u archvsync runmirrors -a security-buildd-pool

  • debian/control
    ... ... @@ -2,6 +2,9 @@ Source: dak
    2 2 
     Section: misc
    3 3 
     Priority: optional
    4 4 
     Build-Depends: debhelper (>= 9~),
    5 
    +# Either a recent debhelper/dpkg-dev or fakeroot is needed to build test packages
    6 
    +               debhelper (>= 11.2~) | fakeroot,
    7 
    +               dpkg-dev (>= 1.19.0.5) | fakeroot,
    5 8 
                    jq,
    6 9 
                    postgresql-10 | postgresql-9.6 | postgresql-9.4,
    7 10 
                    postgresql-10-debversion | postgresql-9.6-debversion | postgresql-9.4-debversion,
    ... ... @@ -20,6 +23,7 @@ Maintainer: Debian FTP-Masters <ftpmaster@debian.org>
    20 23 
     Uploaders: Mark Hymers <mhy@debian.org>,
    21 24 
                Joerg Jaspert <joerg@debian.org>,
    22 25 
                Torsten Werner <twerner@debian.org>
    26 
    +Rules-Requires-Root: no
    23 27 
     Standards-Version: 3.9.6.0
    24 28
    25 29 
     Package: dak

  • tests/fixtures/packages/linux-42.0/debian/control
    ... ... @@ -3,6 +3,7 @@ Section: kernel
    3 3 
     Priority: optional
    4 4 
     Maintainer: A Maintainer <maint@example.com>
    5 5 
     Build-Depends: debhelper (>= 9)
    6 
    +Rules-Requires-Root: no
    6 7
    7 8 
     Package: linux-image-all
    8 9 
     Architecture: all

  • tests/fixtures/packages/nonfree-package-0.1/debian/control
    ... ... @@ -3,6 +3,7 @@ Section: non-free/misc
    3 3 
     Priority: extra
    4 4 
     Maintainer: A Maintainer <maint@example.com>
    5 5 
     Build-Depends: debhelper (>= 9)
    6 
    +Rules-Requires-Root: no
    6 7
    7 8 
     Package: nonfree-package
    8 9 
     Architecture: all

  • tests/fixtures/packages/package-0.1/debian/control
    ... ... @@ -4,6 +4,7 @@ Priority: extra
    4 4 
     Maintainer: A Maintainer <maint@example.com>
    5 5 
     Uploaders: An Uploader <uploader@example.com>
    6 6 
     Build-Depends: debhelper (>= 9)
    7 
    +Rules-Requires-Root: no
    7 8
    8 9 
     Package: package
    9 10 
     Architecture: all

  • tests/fixtures/packages/package-built-using-0.1/debian/control
    ... ... @@ -3,6 +3,7 @@ Section: misc
    3 3 
     Priority: extra
    4 4 
     Maintainer: A Maintainer <maint@example.com>
    5 5 
     Build-Depends: debhelper (>= 9)
    6 
    +Rules-Requires-Root: no
    6 7
    7 8 
     Package: package-built-using
    8 9 
     Architecture: all

  • tests/run-dbtests
    1 1 
     #!/bin/bash
    2 2
    3 
    +set -e
    4 
    +
    3 5 
     # Create the database that will be used by the fixtures, populating it with the
    4 6 
     # default data.  Also create a test dak directory.
    5 7
    ... ... @@ -12,9 +14,11 @@ export PGDATABASE=test_projectb
    12 14
    13 15 
     if [[ ! -v DAK_INTEGRATION_TEST ]]; then
    14 16 
       SYS_CMD="sudo"
    17 
    +  KEEP_ENV_OPT="-E"
    15 18 
       USER_CMD="sudo -u dak PGDATABASE=${PGDATABASE} DAKBASE=${DAKBASE}"
    16 19 
     else
    17 20 
       SYS_CMD=""
    21 
    +  KEEP_ENV_OPT=""
    18 22 
       USER_CMD=""
    19 23 
     fi
    20 24
    ... ... @@ -26,7 +30,7 @@ test-setup() {
    26 30
    27 31 
     test-cleanup() {
    28 32 
       echo Dropping DB ${PGDATABASE}
    29 
    -  $USER_CMD  -E dropdb ${PGDATABASE}
    33 
    +  $USER_CMD $KEEP_ENV_OPT dropdb ${PGDATABASE}
    30 34 
       echo Deleting temporary directory
    31 35 
       $SYS_CMD rm -rf -- ${DAKBASE}
    32 36 
     }

    • —
    View it on GitLab.
    You're receiving this email because of your account on salsa.debian.org. If you'd like to receive fewer emails, you can adjust your notification settings.

    Reply to: