Merge remote-tracking branch 'origin/pr/156'

* origin/pr/156:
  .qubesbuilder: replace 'spec' by 'build'
  Add Qubes Builder v2 integration

Author: marmarek

.gitlab-ci.yml

@@ -1,10 +1,15 @@
 include:
-  - project: 'QubesOS/qubes-continuous-integration'
-    file: '/r4.1/gitlab-base.yml'
-  - project: 'QubesOS/qubes-continuous-integration'
-    file: '/r4.1/gitlab-dom0.yml'
-  - project: 'QubesOS/qubes-continuous-integration'
-    file: '/r4.1/gitlab-vm.yml'
-
+- file: /r4.1/gitlab-base.yml
+  project: QubesOS/qubes-continuous-integration
+- file: /r4.1/gitlab-dom0.yml
+  project: QubesOS/qubes-continuous-integration
+- file: /r4.1/gitlab-vm.yml
+  project: QubesOS/qubes-continuous-integration
+- file: /r4.2/gitlab-base.yml
+  project: QubesOS/qubes-continuous-integration
+- file: /r4.2/gitlab-host.yml
+  project: QubesOS/qubes-continuous-integration
+- file: /r4.2/gitlab-vm.yml
+  project: QubesOS/qubes-continuous-integration
 variables:
-  TRAVIS_INSTALL_EXCLUDE_DOM0: "qubes-gui-agent"
+  TRAVIS_INSTALL_EXCLUDE_DOM0: qubes-gui-agent

.qubesbuilder

@@ -0,0 +1,14 @@
+host:
+  rpm:
+    build:
+    - rpm_spec/gui-agent.spec
+vm:
+  rpm:
+    build:
+    - rpm_spec/gui-agent.spec
+  deb:
+    build:
+    - debian
+  archlinux:
+    build:
+    - archlinux