X-Git-Url: https://git.adam-barratt.org.uk/?p=mirror%2Fdsa-puppet.git;a=blobdiff_plain;f=.gitlab-ci.yml;h=568f97eba18d3dd7b541b3642a6b9429b67b1291;hp=568ea635f4d3d557de39d53043ec821b7db9709f;hb=HEAD;hpb=6b91b43821b532ef0e24c4645d18e91d5d249ea0

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 568ea635f..568f97eba 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -8,15 +8,16 @@
     - git config --global user.email "you@example.com"
 
     - apt-get update
-    - apt-get install -y cmake libldap-dev libsasl2-dev
+    - apt-get install -y cmake libaugeas-dev libcurl4-openssl-dev libssl-dev libldap-dev libsasl2-dev pkg-config
     - bundle install --binstubs bin --with octocatalog
 
-    - git branch -f base $REF_BASE
-    - git branch -f test $CI_BUILD_REF
-
-    - echo -n "$R10K" > r10k.yaml
-    - bundle exec r10k deploy environment --verbose debug base test
-    - spec/octocatalog/run-octocatalog base test
+    - echo -n "$FILE_R10K" > r10k.yaml
+    - git branch -f $ENV_BASE origin/$ENV_BASE
+    - git branch -f $ENV_TEST $CI_BUILD_REF
+    - bundle exec r10k deploy environment --puppetfile --verbose debug $ENV_BASE $ENV_TEST
+    - spec/octocatalog/init-system
+    - spec/octocatalog/init-env
+    - spec/octocatalog/run-octocatalog
 
 test-octocatalog/master:
   <<: *test-octocatalog
@@ -25,8 +26,9 @@ test-octocatalog/master:
     - master
 
   variables:
-    REF_BASE: origin/master
-    R10K: |
+    ENV_BASE: master
+    ENV_TEST: test_octocatalog
+    FILE_R10K: |
       cachedir: 'cache'
       sources:
         plain: