From 351e51ea43ca1da6bf8e2eaee4b2c8c5a6f4bb5d Mon Sep 17 00:00:00 2001
From: Alexander Diewald <diewald@fortiss.org>
Date: Mon, 27 Jan 2020 13:58:36 +0100
Subject: [PATCH] CI: Add deploy phase, export correct products
* Also, use untracked artifacts and dependencies such
that intermediate artifacts are not included in the
pipeline's artifacts.
Signed-off-by: Alexander Diewald <diewald@fortiss.org>
---
.gitlab-ci.yml | 22 +++++++++++++++++++++-
1 file changed, 21 insertions(+), 1 deletion(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 806738a..3b34b9b 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -3,6 +3,7 @@ image: git.fortiss.org:5001/diewald/maven-releng:latest
stages:
- build
- test
+ - deploy
variables:
# recursive should work here, but gitlab-runner does not pull the latest remote
@@ -30,13 +31,16 @@ build:
script:
- mvn $MAVEN_CLI_OPTS $MAVEN_BUILD_OPTS verify
artifacts:
+ untracked: true
paths:
- releng/org.fortiss.af3.update/target/repository/
- releng/org.fortiss.tooling.update/target/repository/
- - products/af3/org.fortiss.af3.phoenix.product/target/extraArtifacts/
+ - products/af3/org.fortiss.af3.phoenix.product/target/products/
test:
stage: test
+ dependencies:
+ - build
cache:
key: Default
before_script:
@@ -47,3 +51,19 @@ test:
- xvfb.sh # Setup of a virtual display needed for bringing up eclipse
script:
- mvn $MAVEN_CLI_OPTS $MAVEN_TEST_OPTS $MAVEN_BUILD_DIR integration-test
+ artifacts:
+ paths:
+ - tests/af3/org.fortiss.af3.phoenix.product.tests/target/surefire-reports/TEST-org.fortiss.af3.phoenix.product.tests.AllTests.xml
+ - products/af3/org.fortiss.af3.phoenix.product/target/products/org.fortiss.af3.phoenix.product-linux.gtk.x86_64.zip
+ - products/af3/org.fortiss.af3.phoenix.product/target/products/org.fortiss.af3.phoenix.product-macosx.cocoa.x86_64.zip
+ - products/af3/org.fortiss.af3.phoenix.product/target/products/org.fortiss.af3.phoenix.product-win32.win32.x86_64.zip
+
+deploy:
+ stage: deploy
+ dependencies:
+ - test
+ artifacts:
+ paths:
+ - products/af3/org.fortiss.af3.phoenix.product/target/products/org.fortiss.af3.phoenix.product-linux.gtk.x86_64.zip
+ - products/af3/org.fortiss.af3.phoenix.product/target/products/org.fortiss.af3.phoenix.product-macosx.cocoa.x86_64.zip
+ - products/af3/org.fortiss.af3.phoenix.product/target/products/org.fortiss.af3.phoenix.product-win32.win32.x86_64.zip
\ No newline at end of file
--
GitLab