From c65a0d4b8d4f0a1652c0199fa73d53834523dee4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Mathias=20G=C3=B6bel?= <goebel@sub.uni-goettingen.de>
Date: Wed, 5 Dec 2018 10:21:01 +0100
Subject: [PATCH 1/2] setting up a test env based in local development in this
 repo

---
 .gitignore              |  2 ++
 .gitlab-ci.yml          | 46 ++++++++++++++++++++++++++++++-------
 Jenkinsfile             | 23 -------------------
 build.properties        |  8 +++++++
 build.xml               | 50 ++++++++++++++++++++++++++++++++---------
 expath-pkg.xml          | 10 +++++++--
 expath-pkg.xml.tmpl     | 13 +++++++++++
 master.build.properties |  2 ++
 8 files changed, 111 insertions(+), 43 deletions(-)
 delete mode 100644 Jenkinsfile
 create mode 100644 build.properties
 create mode 100644 expath-pkg.xml.tmpl
 create mode 100644 master.build.properties

diff --git a/.gitignore b/.gitignore
index 567609b..1dd9d21 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,3 @@
 build/
+test/
+local.build.properties
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index d143cbb..14367a0 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,25 +1,55 @@
-image: frekele/ant
+image: docker.gitlab.gwdg.de/fontane-notizbuecher/build:latest
 
 stages:
   - build
+  - test
   - deploy
 
-ant:
+build-develop:
+  except:
+      - master
+      - tags
   stage: build
   script:
-    - echo "starting ant build"
     - ant
   artifacts:
     paths:
       - build/*.xar
 
+build-master:
+  only:
+      - master
+  stage: build
+  script:
+    - cp master.build.properties local.build.properties
+    - ant
+  artifacts:
+    paths:
+      - build/*.xar
+
+installation:
+  except:
+      - tags
+  stage: test
+  script:
+    - ant test
+    - bash test/eXist-db-*/bin/startup.sh | tee output.log &
+    # wait for eXist
+    - while [ $(curl --head --silent http://localhost:8080 | grep -c "200 OK") == 0 ]; do sleep 2s; done
+    # shutdown eXist
+    - bash test/eXist-db-*/bin/shutdown.sh
+    - ls -al /tmp; mv /tmp/tests-* . || true
+  artifacts:
+    paths:
+      - output.log
+      - test/eXist-db-*/webapp/WEB-INF/logs/expath-repo.log
+    reports:
+        junit: tests-*.xml
+
 upload:
+  except:
+      - tags
   stage: deploy
   script:
     - FILENAME=$(ls build/*.xar)
     - curl -u ci:${EXIST_UPLOAD_PW} -X POST -F file=@${FILENAME} https://ci.de.dariah.eu/exist-upload
-
-trigger_build:
-  stage: deploy
-  script:
-    - "curl -X POST -F token=${GITLAB_TRIGGER_TOKEN} -F ref=develop https://gitlab.gwdg.de/api/v4/projects/2056/trigger/pipeline"
diff --git a/Jenkinsfile b/Jenkinsfile
deleted file mode 100644
index ccf3141..0000000
--- a/Jenkinsfile
+++ /dev/null
@@ -1,23 +0,0 @@
-node {
-
-  stage('Preparation') {
-    checkout scm
-    sh 'rm -f build/*.xar'
-  }
-
-  stage('Build') {
-    sh 'ant'
-  }
-
-  stage('Publish') {
-    archiveArtifacts artifacts: 'build/*.xar', onlyIfSuccessful: true
-    FILENAME = sh (
-        script: "find build/ -name '*.xar' -exec basename {} \\;",
-        returnStdout: true
-      ).trim()
-    sh "curl -X POST -F 'file=@build/${FILENAME}' http://localhost:8181/exist/apps/receiver.xql"
-  }
-  stage('Server') {
-      build job: 'SADE_Server', wait: false
-  }
-}
diff --git a/build.properties b/build.properties
new file mode 100644
index 0000000..8f152c6
--- /dev/null
+++ b/build.properties
@@ -0,0 +1,8 @@
+project.name=http://textgrid.de/ns/SADE-develop
+project.version=3.0.1
+project.title=Scalable Architecture for Digital Editions powered by TextGrid
+project.abbrev=SADE-develop
+project.processorversion=4.5.0
+
+destfile=${build.dir}/${project.abbrev}-${project.version}.xar
+test.dir=test
diff --git a/build.xml b/build.xml
index 4cbdffd..3b58f79 100644
--- a/build.xml
+++ b/build.xml
@@ -1,13 +1,43 @@
-<project default="xar" name="SADE">
-    <xmlproperty file="expath-pkg.xml"/>
-      <property name="project.version" value="${package(version)}"/>
-      <property name="project.app" value="${package(abbrev)}"/>
-    <property name="build.dir" value="build"/>
-    <target name="xar">
+<?xml version="1.0" encoding="UTF-8"?>
+<project default="xar" name="SADE" xmlns:xdb="http://exist-db.org/ant">
+
+  <property environment="env"/>
+  <property name="build.dir" value="build"/>
+  <property file="local.build.properties"/>
+  <property file="build.properties"/>
+  <xmlproperty file="expath-pkg.xml.tmpl"/>
+
+    <target name="xar" depends="cleanup">
+        <copy file="expath-pkg.xml.tmpl" tofile="expath-pkg.xml" filtering="true" overwrite="true">
+            <filterset>
+                <filter token="project.version" value="${project.version}"/>
+                <filter token="project.title" value="${project.title}"/>
+                <filter token="project.abbrev" value="${project.abbrev}"/>
+                <filter token="project.name" value="${project.name}"/>
+                <filter token="project.processorversion" value="${project.processorversion}"/>
+            </filterset>
+        </copy>
         <mkdir dir="${build.dir}"/>
-        <zip
-          basedir="."
-          destfile="${build.dir}/${project.app}-${project.version}.xar"
-          excludes="${build.dir}/*,${build.dir},Jenkinsfile,git.branches,**/.hooks,**/.hooks/*"/>
+        <zip basedir="." destfile="${destfile}"
+            excludes="${build.dir}/*,${test.dir}/*"/>
     </target>
+
+    <target name="cleanup">
+      <delete dir="${test.dir}"/>
+    </target>
+
+    <target name="test" depends="xar">
+      <get src="https://bintray.com/existdb/releases/download_file?file_path=eXist-db-${project.processorversion}.tar.bz2" dest="${build.dir}/eXist-db-${project.processorversion}.tar.bz2" skipexisting="true" />
+      <untar src="${build.dir}/eXist-db-${project.processorversion}.tar.bz2" dest="${test.dir}" compression="bzip2" />
+
+      <get src="https://ci.de.dariah.eu/exist-repo/find.zip?abbrev=sade_assets&amp;processor=${project.processorversion}" dest="${test.dir}/eXist-db-${project.processorversion}/autodeploy/sade_assets-latest.xar" ignoreerrors="true"/>
+      <get src="https://ci.de.dariah.eu/exist-repo/find.zip?abbrev=cv&amp;processor=${project.processorversion}" dest="${test.dir}/eXist-db-${project.processorversion}/autodeploy/codeview-latest.xar" ignoreerrors="true"/>
+      <get src="https://ci.de.dariah.eu/exist-repo/find.zip?abbrev=fontane-lucene-exist-module&amp;processor=${project.processorversion}" dest="${test.dir}/eXist-db-${project.processorversion}/autodeploy/fontane-lucene-latest.xar" ignoreerrors="true"/>
+
+      <get src="http://exist-db.org/exist/apps/public-repo/find.zip?abbrev=markdown&amp;processor=${project.processorversion}" dest="${test.dir}/eXist-db-${project.processorversion}/autodeploy/markdown-latest.xar" ignoreerrors="true"/>
+      <get src="http://exist-db.org/exist/apps/public-repo/find.zip?abbrev=functx&amp;processor=${project.processorversion}" dest="${test.dir}/eXist-db-${project.processorversion}/autodeploy/functx-latest.xar" ignoreerrors="true"/>
+
+      <copy file="${destfile}" todir="${test.dir}/eXist-db-${project.processorversion}/autodeploy" />
+    </target>
+
 </project>
diff --git a/expath-pkg.xml b/expath-pkg.xml
index 85d1c53..c9bad85 100644
--- a/expath-pkg.xml
+++ b/expath-pkg.xml
@@ -1,7 +1,13 @@
-<package xmlns="http://expath.org/ns/pkg" name="https://sade.textgrid.de/ns/SADE" abbrev="SADE" version="3.0.0" spec="1.0">
+<?xml version="1.0" encoding="UTF-8"?>
+<package xmlns="http://expath.org/ns/pkg"
+  name="http://textgrid.de/ns/SADE-develop"
+  abbrev="SADE-develop"
+  version="3.0.1"
+  spec="1.0">
     <title>Scalable Architecture for Digital Editions powered by TextGrid</title>
+    <dependency processor="http://exist-db.org" semver-min="4.5.0"/>
     <dependency package="http://exist-db.org/apps/shared"/>
     <dependency package="https://sade.textgrid.de/ns/assets"/>
     <dependency package="http://www.functx.com"/>
-     <dependency package="http://exist-db.org/apps/markdown"/>
+    <dependency package="http://exist-db.org/apps/markdown"/>
 </package>
diff --git a/expath-pkg.xml.tmpl b/expath-pkg.xml.tmpl
new file mode 100644
index 0000000..c602282
--- /dev/null
+++ b/expath-pkg.xml.tmpl
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<package xmlns="http://expath.org/ns/pkg"
+  name="@project.name@"
+  abbrev="@project.abbrev@"
+  version="@project.version@"
+  spec="1.0">
+    <title>@project.title@</title>
+    <dependency processor="http://exist-db.org" semver-min="@project.processorversion@"/>
+    <dependency package="http://exist-db.org/apps/shared"/>
+    <dependency package="https://sade.textgrid.de/ns/assets"/>
+    <dependency package="http://www.functx.com"/>
+    <dependency package="http://exist-db.org/apps/markdown"/>
+</package>
diff --git a/master.build.properties b/master.build.properties
new file mode 100644
index 0000000..5429506
--- /dev/null
+++ b/master.build.properties
@@ -0,0 +1,2 @@
+project.abbrev=SADE
+project.name=http://textgrid.de/ns/SADE
-- 
GitLab


From 9dcbac7166c9f05435c819842e2f897e871c31cc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Mathias=20G=C3=B6bel?= <goebel@sub.uni-goettingen.de>
Date: Wed, 5 Dec 2018 10:41:16 +0100
Subject: [PATCH 2/2] publish packages from develop and master branch only

---
 .gitlab-ci.yml | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 14367a0..a22462e 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -47,6 +47,9 @@ installation:
         junit: tests-*.xml
 
 upload:
+  only:
+      - master
+      - develop
   except:
       - tags
   stage: deploy
-- 
GitLab