From 3a872d545763758796cea3a917725745b8b4e457 Mon Sep 17 00:00:00 2001
From: Lars Wirzenius <lwirzenius@wikimedia.org>
Date: Fri, 17 Apr 2020 14:00:17 +0300
Subject: Change: worker-scap to be based on buster

---
 worker-scap.vmdb |  5 ++++-
 worker-scap.yml  | 49 +++++++++++++++++++++++++++++++++++++++++++++----
 2 files changed, 49 insertions(+), 5 deletions(-)

diff --git a/worker-scap.vmdb b/worker-scap.vmdb
index ba1c857..2467378 100644
--- a/worker-scap.vmdb
+++ b/worker-scap.vmdb
@@ -18,9 +18,11 @@ steps:
 
   - mount: /
 
+  - virtual-filesystems: /
+
   - unpack-rootfs: /
 
-  - debootstrap: jessie
+  - debootstrap: buster
     mirror: http://deb.debian.org/debian
     target: /
     unless: rootfs_unpacked
@@ -29,6 +31,7 @@ steps:
     packages:
     - linux-image-amd64
     - python
+    - openssh-server
     tag: /
     unless: rootfs_unpacked
 
diff --git a/worker-scap.yml b/worker-scap.yml
index 29e1820..7387483 100644
--- a/worker-scap.yml
+++ b/worker-scap.yml
@@ -13,34 +13,45 @@
           auto eth0
           iface eth0 inet dhcp
         dest: /etc/network/interfaces
+    - copy:
+        content: "{{ ci_prod_signing_key }}"
+        dest: /etc/apt/trusted.gpg.d/ci_prod.asc
+    - apt_repository:
+        repo: "deb http://ci-prod-controller.vm.liw.fi/debian unstable-ci main"
     - apt:
         name:
           - bash-completion
           - build-essential
+          - ca-certificates
           - debhelper
+          - dh-python
+          - flake8
           - git
           - git-buildpackage
+          - libjpeg-dev
           - locales-all
           - openssh-server
+          - openssl
           - pandoc
-          - php5
-          - python
+          - php
           - python-all-dev
           - python-concurrent.futures
           - python-configparser
           - python-flake8
           - python-jinja2
+          - python-openssl
           - python-psutil
           - python-pygments
           - python-requests
           - python-setuptools
           - python-six
-          - python-tox
           - python-yaml
-          - python3
           - python3-all-dev
           - rsync
+          - subplot
           - sudo
+          - tox
+          - zlib1g-dev
     - user:
         comment: "Worker"
         name: worker
@@ -76,3 +87,33 @@
     ansible_python_interpreter: /usr/bin/python
     user_pub: |
       ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAACAQDAlECa3tbFGXhB3Zh/4/GhM11THOThVfiuLqqJ2dpWHEClzpKJHpzzwWt7g9z/MMQNMsUJLy+okz+De6hdjjmYJ9kG9Sr3H4YKq6itGQMj7L/cH3WS3ynp0uy0oW3hf932vDZKQ8iy9vczXH+ERYl+4TYae1Jp4Hyf4/2IYxEfuhKctvSvqySST3Qk9JNZ71HFGOWhjH/MmoCLoT1v+HkqmHdYf/GMKGRo3gqCEGgCgNErYYIyKm3OF3dHXK+hyGLE/cZNu6fU5woW3rvtUCFt08Ri2pm0cnXXJn9jQIMxfS5Kkf64svwgzKmPqgX1f4flopYPlsBXduCgzbJvj+lpgauAk/i1A5B01CFa9sI4C6pHZmwk1qxRwN+4IXL2CQt+tDgYC84ZDDd8R7cNyL22a3KhMQmdHtvog1beAa3Ab+J+cafkXXN+Es9f1wQjzk7DiHupmJIVofBvPP+cRcB46rwha6ati8Fa5QkT9rXFNqQsKk7jq8TIi54Bm15OOa0jInGG3TM17b9Ftu2WTJSAaqgBnDfZiInK7HEvC6K/IBljrN3oGagmFZPrAvzw7d6C2/nKFAQtfoMcE5oWVDrJyjsmJ8oaru0E8rwj7mMvyKPgEMnXTGXLWDgEo50+i291m4bkCxVwiOPbPRvdMll1Y8qfBAPT76sY4Ikgcw/2iw== openpgp:0xBBE80E50
+    ci_prod_signing_key: |
+        -----BEGIN PGP PUBLIC KEY BLOCK-----
+
+        mQINBFrLO7kBEADdz6mHstYmKU5Dp6OSjxWtWaqTDOX1sJdmmaIK/9EKVIH0Maxp
+        5kvVO5G6mULLAjv/kLG0MxasHPrq8I2A/y8AqKAGVL8QelwLjQMIFZ30/VbGQPHS
+        +T5TZXEnoQtNce1GUhFwJ38ZyjjwHBFV9tSec7rZ2Q3YeM3nNnGPf6DacXGfEOPO
+        HIN4sXAN2hzNXNjKRzTIvxQseb6nr7afUh/SlZ3yhQOCrIzmYlD7tP9WJe7ofL0p
+        JY4pDQYw8rT6nC2BE/ioemh84kERCT1vCe+OVFlSRuMlqfEv+ZpKQ+itOmPDQ/lM
+        jpUm1K2hrW/lWpxT/ZxHKo/w1K36J5WshgMZxfUu5BMCL9LMqMcrXNhNjDMfxDMM
+        3yBPOvQ4ls6fecOZ/bsFo1p8VzMk/w/eG8vPs5yuNa5XxN95yFMXoOHGb5Xbu8D4
+        6yiW+Af70LbiSNpGdmNdneiGB2fY38NxBukPw5u3S5qG8HedSmMr1RvSr5kHoAAe
+        UbOY+BYaaKsTAT7+1skUW1o3FJSqoRKCHAzTsMWC6zzhR8hRn7jVrrguH1hGbqq5
+        TZSCFQZExuTJ7uXrTLG0WoBXIjB5wWNcSeXn8myUWYB51nJNF4tJBouZOz9JwWGl
+        kiAQkrHnBttLQWdW9FyjbIoTZMtpvVx+m6ObGTGdGL1cNlLAvWprMXGc+QARAQAB
+        tDJJY2sgQVBUIHJlcG9zaXRvcnkgc2lnbmluZyBrZXkgKDIwMTgpIDxsaXdAbGl3
+        LmZpPokCTgQTAQgAOBYhBKL1uyDoXyxUH3O717Wr+TZVS6PGBQJayzu5AhsDBQsJ
+        CAcCBhUICQoLAgQWAgMBAh4BAheAAAoJELWr+TZVS6PGB5QQANTcikhRUHwt9N4h
+        dGc/Hp6CbqdshMoWlwpFskttoVDxQG5OAobuZl5XyzGcmja1lT85RGkZFfbca0IZ
+        LnXOLLSAu51QBkXNaj4OhjK/0uQ+ITrvL6RQSXNgHiUTR/W2XD1GIUq6nBqe2GSN
+        31S1baYKKVj5QIMsi7Dq8ls3BBXuPCE+xTSaNmGWjes2t9pPidcRvxsksCLY1qgw
+        P1GFXBeMkBQ29kBP87SUL15SIk7OiQLlEURCy5iRls5rt/YEsdEpRWIb0Tm5Nrjv
+        2M3VM+iBhfNXTwj0rJ34mlycF1qQmA7YcTEobT7z587GPY0VWzBpQUnEQj7rQWPM
+        cDYY0b+I6kQ8VKOaL4wVAtE98d7HzFIrIrwhTKufnrWrVDPYsmLZ+LPC1jiF7JBD
+        SR6Vftb+SdDR9xoE1yRuXbC6IfoW+5/qQNrdQ2mm9BFw5jOonBqchs18HTTf3441
+        6SWwP9fY3Vi+IZphPPi0Gf85oMStgnv/Wnw6LacEL32ek39Desero/D8iGLZernK
+        Q2mC9mua5A/bYGVhsNWyURNFkKdbFa+/wW3NfdKYyZnsSfo+jJ2luNewrhAY7Kod
+        GWXTer9RxzTGA3EXFGvNr+BBOOxSj0SfWTl0Olo7J5dnxof+jLAUS1VHpceHGHps
+        GSJSdir7NkZidgwoCPA7BTqsb5LN
+        =dXB0
+        -----END PGP PUBLIC KEY BLOCK-----
-- 
cgit v1.2.1