From 9fb099be73bb2a60bc6ecab211f9b709446881ab Mon Sep 17 00:00:00 2001
From: Ana Huelamo <ana.huelamo@codethink.co.uk>
Date: Thu, 27 Oct 2016 16:12:55 +0100
Subject: try ostree deployment and gnome system build

---
 .gitlab-ci.yml | 120 ++++++++-------------------------------------------------
 DEFAULTS       |  10 ++---
 2 files changed, 22 insertions(+), 108 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 78d90dc2..78d6c591 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -2,116 +2,30 @@ image: python:2.7-slim
 
 before_script:
   - export LC_ALL="C.UTF-8"
-  - apt-get update -qq && apt-get install -y -qq git
-  - git clone https://gitlab.com/baserock/ybd.git && cd ybd && git checkout tacgomes/artifact-splitting && cd ..
-  - cd ybd && ./install_dependencies.sh && cd ..
-
-build-system-x86_64-chroot-build:
-  stage: build
-  script:
-  - ybd/ybd.py systems/build-system-x86_64-chroot.morph x86_64
-  only:
-  - master
-  - /^staging\/.*$/
-
-#build-system-x86_64-chroot-deploy:
-#  stage: deploy
-#  dependencies:
-#  - build-system-x86_64-chroot-build
-#  script:
-#  - ybd/ybd.py clusters/build-system-x86_64-chroot-deploy.morph x86_64
-#  artifacts:
-#    name: "${CI_BUILD_NAME}-${CI_BUILD_REF}"
-#    paths:
-#    - build-system-x86_64-chroot.tar
-#  only:
-#  - master
-#  - /^staging\/.*$/
-
-#build-system-armv7lhf-rootfs-build:
-#  stage: build
-#  script:
-#  - sudo ybd/ybd.py systems/build-system-armv7lhf-rootfs.morph armv7lhf
-#  tags:
-#  - armv7l
-#  only:
-#  - master
-#  - /^staging\/.*$/
-
-devel-build-64:
-  stage: build
-  script:
-  - ybd/ybd.py systems/devel-system-x86_64-generic.morph x86_64
-  only:
-  - master
-  - /^staging\/.*$/
-
-genivi-baseline-build-64:
-  stage: build
-  script:
-  - ybd/ybd.py genivi/systems/genivi-baseline-system-x86_64-generic.morph x86_64
-  - ybd/ybd.py systems/initramfs-x86_64.morph x86_64
-  only:
-  - master
-  - /^staging\/.*$/
-
-genivi-demo-platform-build-64:
-  stage: build
-  script:
-  - ybd/ybd.py genivi/systems/genivi-demo-platform-x86_64-generic.morph x86_64
-  - ybd/ybd.py systems/initramfs-x86_64.morph x86_64
-  only:
-  - master
-  - /^staging\/.*$/
-
-ivi-build-64:
-  stage: build
-  script:
-  - ybd/ybd.py ivi/systems/ivi-system-x86_64.morph x86_64
-  - ybd/ybd.py systems/initramfs-x86_64.morph x86_64
-  only:
-  - master
-  - /^staging\/.*$/
-
-gnome-build-64:
-  stage: build
-  script:
-  - ybd/ybd.py gnome/systems/gnome-system-x86_64.morph x86_64
-  - ybd/ybd.py systems/initramfs-x86_64.morph x86_64
-  only:
-  - master
-  - /^staging\/.*$/
+  - apt-get update -qq && apt-get install -y -qq git 
+  - git clone https://gitlab.com/baserock/ybd.git && cd ybd && git checkout tacgomes/artifact-splitting  && ./install_dependencies.sh && cd ..
+  - echo "deb http://us.archive.ubuntu.com/ubuntu yakkety main universe" >> /etc/apt/sources.list
+  - apt-get update -qq && apt-get install --force-yes -qq ostree gir1.2-ostree-1.0 python-dev python-gi
+  - mkdir -p /ostree/repo
+  - ostree init --repo=/ostree/repo
 
 minimal-build-64:
   stage: build
   script:
   - ybd/ybd.py systems/minimal-system-x86_64-generic.morph x86_64
-  only:
-  - master
-  - /^staging\/.*$/
-
-trove-build-64:
-  stage: build
-  script:
-  - ybd/ybd.py trove/systems/trove-system-x86_64.morph x86_64
-  only:
-  - master
-  - /^staging\/.*$/
 
-weston-build-64:
+gnome-build-64:
   stage: build
   script:
-  - ybd/ybd.py weston/systems/weston-system-x86_64-generic.morph x86_64
-  - ybd/ybd.py systems/initramfs-x86_64.morph x86_64
-  only:
-  - master
-  - /^staging\/.*$/
+  - ybd/ybd.py systems/gnome-system-x86_64.morph x86_64
 
-weston-qt-build-64:
-  stage: build
+minimal-system-x86_64-ostree-deploy:
+  stage: deploy
   script:
-  - ybd/ybd.py weston/systems/weston-qt5-system-x86_64.morph x86_64
-  - ybd/ybd.py systems/initramfs-x86_64.morph x86_64
-  only:
-  - master
-  - /^staging\/.*$/
+  - ybd/ybd.py clusters/minimal-system-deploy-ostree.morph x86_64
+  dependencies:
+  - minimal-build-64
+  artifacts:
+    name: "${CI_BUILD_NAME}-${CI_BUILD_REF}"
+    paths:
+    - minimal-system-x86_64-ostree.tar
diff --git a/DEFAULTS b/DEFAULTS
index 83f0afed..09d4d22b 100644
--- a/DEFAULTS
+++ b/DEFAULTS
@@ -172,17 +172,17 @@ split-rules:
   chunk:
     - artifact: -bins
       include:
-        - (usr/)?s?bin/.*
+        - usr/s?bin/.*
     - artifact: -libs
       include:
-        - (usr/)?lib(32|64)?/lib[^/]*\.so(\.\d+)*
+        - usr/lib(32|64)?/lib[^/]*\.so(\.\d+)*
         - (usr/)libexec/.*
     - artifact: -devel
       include:
         - (usr/)?include/.*
-        - (usr/)?lib(32|64)?/lib.*\.a
-        - (usr/)?lib(32|64)?/lib.*\.la
-        - (usr/)?(lib(32|64)?|share)/pkgconfig/.*\.pc
+        - usr/lib(32|64)?/lib.*\.a
+        - usr/lib(32|64)?/lib.*\.la
+        - usr/(lib(32|64)?|share)/pkgconfig/.*\.pc
     - artifact: -doc
       include:
         - (usr/)?share/doc/.*
-- 
cgit v1.2.1