From 41e59b457ad609f3c54d670de5e35c091e007fcb Mon Sep 17 00:00:00 2001
From: Lars Wirzenius <liw@liw.fi>
Date: Mon, 30 Dec 2019 11:23:13 +0200
Subject: Fix: vmdb2 build in Debian unstable

The problem seems to be that unstable is temporarily in a state where
upgrading it from the systree artifact to current removes debhelper
and build-essential, and they don't get installed automatically by the
ick/install_debian_build_dependencies step. Fix is to install them
manually.
---
 ci-prod-programs.ick | 35 +++++++++++++++++++++++++++++++++--
 1 file changed, 33 insertions(+), 2 deletions(-)

diff --git a/ci-prod-programs.ick b/ci-prod-programs.ick
index ec5b6a7..5f5738c 100644
--- a/ci-prod-programs.ick
+++ b/ci-prod-programs.ick
@@ -655,8 +655,17 @@ projects:
         repo: git://git.liw.fi/vmdb2
         ref: master
         location: src
-  pipelines: *deb_ci_pipelines
-
+      - name: debian
+        repo: git://git.liw.fi/vmdb2
+        ref: debian/unstable
+        location: src/debian
+  pipelines:
+    - ick/setup_container
+    - ick/add_apt_signing_keys
+    - ick/add_apt_sources
+    - ick/get_sources
+    - ick/install_debian_build_dependencies
+    - vmdb2_build_deb_ci
 
 
 
@@ -814,3 +823,25 @@ pipelines:
         apt install -y ansible
         cd src
         ansible-playbook -i hosts.effi effi.yml -e reg_domain=effi-reg.vm.liw.fi -e @/workspace/vars/effi-reg.yml
+
+-   pipeline: vmdb2_build_deb_ci
+    parameters:
+      - sources
+      - distribution_ci
+    actions:
+
+      - where: container
+        shell: |
+          rm -rf ick-helpers
+          git clone git://git.liw.fi/ick-helpers
+
+      - shell: |
+          apt-get install -y debhelper build-essential
+        where: container
+
+      - python: |
+          import sys
+          sys.path.insert(0, '/workspace/ick-helpers')
+          import ick_helpers
+          ick_helpers.ci_build_debian(params)
+        where: container
-- 
cgit v1.2.1