From c49ee35352a02ff799c8362adeb8044a73c06fab Mon Sep 17 00:00:00 2001
From: Stuart Wheater <stuart.wheater@arjuna.com>
Date: Fri, 8 Mar 2019 23:11:09 +0000
Subject: [PATCH] Update 'Azure Pipelines' files

---
 azure-pipelines.R       |  3 ---
 azure-pipelines.yml     | 22 ++++++++++++----------
 azure-pipelines_site.pp | 23 +++++++++++++++++++++++
 3 files changed, 35 insertions(+), 13 deletions(-)
 delete mode 100644 azure-pipelines.R
 create mode 100644 azure-pipelines_site.pp

diff --git a/azure-pipelines.R b/azure-pipelines.R
deleted file mode 100644
index 15b7287..0000000
--- a/azure-pipelines.R
+++ /dev/null
@@ -1,3 +0,0 @@
-library(devtools)
-
-check()
diff --git a/azure-pipelines.yml b/azure-pipelines.yml
index 96aad90..3a6334c 100644
--- a/azure-pipelines.yml
+++ b/azure-pipelines.yml
@@ -30,10 +30,10 @@ steps:
     /opt/puppetlabs/bin/puppet --version
     /opt/puppetlabs/puppet/bin/r10k version
 
-    git clone -b ubuntu16 https://github.com/StuartWheater/datashield-infrastructure.git ../datashield-infrastructure
-    pushd ../datashield-infrastructure/puppet/environments/datashield_travis && sudo /opt/puppetlabs/puppet/bin/r10k puppetfile install && popd
-    sudo /opt/puppetlabs/bin/puppet apply ../datashield-infrastructure/puppet/environments/datashield_travis/manifests/site.pp --environment datashield_travis --environmentpath ../datashield-infrastructure/puppet/environments
-  displayName: 'Install Server'
+    git clone -b ubuntu16 https://github.com/datashield/datashield-infrastructure.git ../datashield-infrastructure
+    pushd ../datashield-infrastructure/puppet/environments/datashield_azurepipelines && sudo /opt/puppetlabs/puppet/bin/r10k puppetfile install && popd
+    sudo /opt/puppetlabs/bin/puppet apply azure-pipelines_site.pp --environment datashield_azurepipelines --environmentpath ../datashield-infrastructure/puppet/environments
+  displayName: 'Install DataSHIELD server'
 
 - bash: |
     sudo apt-key adv --keyserver keyserver.ubuntu.com --recv-keys E298A3A825C0D65DFD57CBB651716619E084DAB9
@@ -42,13 +42,15 @@ steps:
     sudo apt-get install -qq libxml2-dev libcurl4-openssl-dev libssl-dev -y
     sudo apt-get install -qq r-base -y
     sudo R -e "install.packages('devtools', dependencies=TRUE)"
-  displayName: 'Install R'
+  displayName: 'Install R client'
 
 - bash: |
-    R CMD BATCH --quiet azure-pipelines.R azure-pipelines.Rout
-  displayName: 'Test'
+    R -e "library('devtools'); devtools::check(args = c('--no-examples'))" | tee azure-pipelines_check.Rout
+    grep --quiet "0 error" azure-pipelines_check.Rout
+  displayName: 'Devtools checks'
+  condition: always()
 
 - bash: |
-    cat azure-pipelines.Rout
-    grep "0 error" azure-pipelines.Rout
-  displayName: 'Results'
+    ./checkDocumentationUpdated.sh
+  displayName: 'Check documents'
+  condition: always()
diff --git a/azure-pipelines_site.pp b/azure-pipelines_site.pp
new file mode 100644
index 0000000..8e70840
--- /dev/null
+++ b/azure-pipelines_site.pp
@@ -0,0 +1,23 @@
+# Datashield for Azure Pipelines testing.
+#
+# Install mysql and mongodb, include test data but don't install the firewall.
+# This is an example please change to meet the needs of your install. Consider changing any passwords in this file!
+#
+
+class { ::datashield:
+  test_data      => true,         # Install the test data
+  firewall       => false,        # Do not install the firewall
+  mysql          => true,         # Install mysql server
+  mongodb        => true,         # Install mongodb server
+  remote_mongodb => false,        # There is not a remote mongodb server
+  remote_mysql   => false,        # There is not a remote mysql server
+
+  dsbase_githubusername      => 'datashield',
+  dsbase_ref                 => 'master',
+  dsstats_githubusername     => 'datashield', 
+  dsstats_ref                => 'master',
+  dsgraphics_githubusername  => 'datashield',
+  dsgraphics_ref             => 'master',
+  dsmodelling_githubusername => 'datashield',
+  dsmodelling_ref            => 'master'
+}