You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@isis.apache.org by da...@apache.org on 2018/08/31 23:46:47 UTC
[isis] 05/06: ISIS-1965: reworks the flatten maven plugin
This is an automated email from the ASF dual-hosted git repository.
danhaywood pushed a commit to branch maint-1.16.2
in repository https://gitbox.apache.org/repos/asf/isis.git
commit 36e738fbc12f4ffd9ffc4adabf745344dce0f204
Author: danhaywood <da...@haywood-associates.co.uk>
AuthorDate: Sat Sep 1 00:33:37 2018 +0100
ISIS-1965: reworks the flatten maven plugin
---
.gitlab-ci.yml | 58 +++++++++++++++++++++++-----------------------------------
1 file changed, 23 insertions(+), 35 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 50607a9..63d0fac 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -44,40 +44,28 @@ build-package-push:
-Dnexus-deploy.repositoryUrl=$NEXUS_REPO_URL \
$CORE_ADDITIONAL_OPTS
- cd ..
+ - cd example/application/$APP_NAME
+ - >
+ mvn --batch-mode \
+ install \
+ -Drevision=$REVISION \
+ -Disis.version=$REVISION \
+ $CORE_ADDITIONAL_OPTS \
+ -Dmavenmixin-docker \
+ -Ddocker-plugin.imageName=$DOCKER_REGISTRY_NAME/$DOCKER_REGISTRY_USERNAME/$APP_NAME
+ - >
+ mvn -s .m2/settings.xml \
+ --batch-mode \
+ docker:push@push-image-tagged \
+ -pl webapp \
+ -Drevision=$REVISION \
+ -Disis.version=$REVISION \
+ -DskipTests \
+ -Dskip.isis-swagger \
+ -Dmavenmixin-docker \
+ -Ddocker-plugin.imageName=$DOCKER_REGISTRY_NAME/$DOCKER_REGISTRY_USERNAME/$APP_NAME \
+ -Ddocker-plugin.serverId=docker-registry \
+ -Ddocker.registryUrl=$DOCKER_REGISTRY_URL
+ - cd ../../..
-#
-# remainder commented out for now, see: https://gitlab.com/gitlab-org/gitlab-runner/issues/3552
-#
-# it's possible that the mvn command to build the Docker image is failing ... it seems to get stuck.
-# maybe the background stuff is deadlocking?
-# then, the CI job for reporting the failure/uploading artifacts then hangs.
-# if that's correct, then commenting this out is a problem because we're masking an error on our side.
-#
-# on the other hand, I can't reproduce this issue locally.
-#
-# - cd example/application/$APP_NAME
-# - >
-# mvn --batch-mode \
-# install \
-# -Drevision=$REVISION \
-# -Disis.version=$REVISION \
-# $CORE_ADDITIONAL_OPTS \
-# -Dmavenmixin-docker \
-# -Ddocker-plugin.imageName=$DOCKER_REGISTRY_NAME/$DOCKER_REGISTRY_USERNAME/$APP_NAME
-# - >
-# mvn -s .m2/settings.xml \
-# --batch-mode \
-# docker:push@push-image-tagged \
-# -pl webapp \
-# -Drevision=$REVISION \
-# -Disis.version=$REVISION \
-# -DskipTests \
-# -Dskip.isis-swagger \
-# -Dmavenmixin-docker \
-# -Ddocker-plugin.imageName=$DOCKER_REGISTRY_NAME/$DOCKER_REGISTRY_USERNAME/$APP_NAME \
-# -Ddocker-plugin.serverId=docker-registry \
-# -Ddocker.registryUrl=$DOCKER_REGISTRY_URL
-# - cd ../../..
-#
-#