Commit d321068f authored by Tony CHEMIT's avatar Tony CHEMIT

use last pom + normalize jobs

parent 8d5d87a6
Pipeline #85145648 failed with stages
in 52 seconds
image: java:8u102-jdk .stage_docker: &stage_docker
stage: Docker
.stage_build: &stage_build
stage: Build
.stage_staging: &stage_staging
stage: Staging
variables: .only_develop: &only_develop
DEVELOP: "develop" only:
MASTER: "master" - develop
STAGE: "ioultreia" .only_tag: &only_tag
only:
- tag
.only_triggers: &only_triggers
only:
- triggers
.except_triggers: &except_triggers
except:
- triggers
.generate-docker-image: &generate-docker-image
image: registry.gitlab.com/ultreiaio/docker/docker:latest
services:
- docker:dind
script:
- if [ -n "${GENERATE_DOCKER}" ]; then ultreiaio-docker-generate-image gitlab-ci-token $CI_BUILD_TOKEN; fi
.publish-site: &publish_site
script:
- ultreiaio-site-multi-module-publish
image: registry.gitlab.com/ultreiaio/${CI_PROJECT_NAME}/docker:latest
stages: stages:
- Docker
- Build - Build
- Test - Test
- Staging - Staging
.before_script_default: &before_script_default docker:
before_script: <<: *stage_docker
- 'which ssh-agent || ( apt-get update -y && apt-get install openssh-client -y )' <<: *only_develop
- eval $(ssh-agent -s) <<: *generate-docker-image
- ssh-add <(echo "$SSH_PRIVATE_KEY") when: manual
- mkdir -p ~/.ssh
- '[[ -f /.dockerenv ]] && echo -e "Host *\n\tStrictHostKeyChecking no\n\n" > ~/.ssh/config'
- (cd ~ ; git clone ssh://git@gitlab.com/ultreiaio/env.git)
- . ~/env/bin/prepare-env.sh "$GITLAB_USER_ID" "$GITLAB_USER_EMAIL"
.before_script_clone: &before_script_clone
before_script: before_script:
- 'which ssh-agent || ( apt-get update -y && apt-get install openssh-client -y )' - export GENERATE_DOCKER=true
- eval $(ssh-agent -s)
- ssh-add <(echo "$SSH_PRIVATE_KEY")
- mkdir -p ~/.ssh
- '[[ -f /.dockerenv ]] && echo -e "Host *\n\tStrictHostKeyChecking no\n\n" > ~/.ssh/config'
- (cd ~ ; git clone ssh://git@gitlab.com/ultreiaio/env.git)
- . ~/env/bin/prepare-env-with-clone.sh "$CI_PROJECT_PATH" "$CI_PROJECT_NAME" "$GITLAB_USER_ID" "$GITLAB_USER_EMAIL"
.env_test: &env_test docker-trigger:
environment: <<: *stage_docker
name: test <<: *only_triggers
<<: *generate-docker-image
.env_staging: &env_staging
environment:
name: staging
.deploy_site: &deploy_site
script:
- wget -q -O - https://gitlab.com/ultreiaio/pom/raw/master/bin/execute-maven.sh | sed 's/$1/install/' | bash
- wget -q -O - https://gitlab.com/ultreiaio/pom/raw/master/bin/execute-maven.sh | sed 's/$1/site site:stage scm-publish:publish-scm -DperformRelease/' | bash
build: ci:
stage: Build <<: *stage_build
<<: *before_script_default <<: *only_develop
<<: *except_triggers
script: script:
- wget -q -O - https://gitlab.com/ultreiaio/pom/raw/master/bin/execute-maven.sh | sed 's/$1/verify/' | bash - ultreiaio-maven-execute 'clean install -DperformRelease'
only:
- develop
- feature/*
except:
- triggers
.test_manual: &test_manual snapshot:
stage: Test <<: *stage_staging
<<: *before_script_default <<: *only_develop
only:
- develop
except:
- triggers
when: manual when: manual
stage:
<<: *env_staging
<<: *test_manual
<<: *before_script_clone
script: script:
- wget -q -O - https://gitlab.com/ultreiaio/pom/raw/master/bin/close-milestone.sh | bash - ultreiaio-maven-execute 'clean deploy -DperformRelease'
- wget -q -O - https://gitlab.com/ultreiaio/pom/raw/master/bin/create-stage.sh | bash
- wget -q -O - https://gitlab.com/ultreiaio/pom/raw/master/bin/close-stage.sh | sed 's/$1/ioultreia/' | bash
- wget -q -O - https://gitlab.com/ultreiaio/pom/raw/master/bin/update-staging-changelog.sh | sed 's/$1/ioultreia/' | bash
- wget -q -O - https://gitlab.com/ultreiaio/pom/raw/master/bin/create-milestone.sh | bash
snapshot: release:
<<: *env_staging <<: *stage_staging
<<: *test_manual <<: *only_develop
when: manual
script: script:
- wget -q -O - https://gitlab.com/ultreiaio/pom/raw/master/bin/execute-maven.sh | sed 's/$1/deploy -DperformRelease/' | bash - ultreiaio-release-gitlab-init
- ultreiaio-milestone-close
latest-site: - ultreiaio-release-start
<<: *env_test - ultreiaio-release-finish
<<: *test_manual - ultreiaio-stage-close-and-release
<<: *deploy_site - ultreiaio-changelog-update
- ultreiaio-milestone-create
.nightly: &nightly
<<: *before_script_default
only:
- triggers
nightly-build: nightly-build:
stage: Build <<: *stage_build
<<: *nightly <<: *only_triggers
script: script:
- wget -q -O - https://gitlab.com/ultreiaio/pom/raw/master/bin/execute-maven.sh | sed 's/$1/verify -DperformRelease/' | bash - if [ -n "${NIGHTLY_BUILD}" ]; then ultreiaio-maven-execute 'clean ~verify -DperformRelease'; fi
nightly-site:
stage: Test
<<: *env_test
<<: *nightly
<<: *deploy_site
.staging: &staging
stage: Staging
only:
- tags
<<: *env_staging
<<: *before_script_default
staging-site:
<<: *staging
<<: *deploy_site
release: deploy-site:
<<: *staging <<: *stage_staging
<<: *only_develop
when: manual when: manual
script: <<: *publish_site
- wget -O - https://gitlab.com/ultreiaio/pom/raw/master/bin/release-stage.sh | sed 's/$1/ioultreia/' | bash
drop: staging-site:
<<: *staging <<: *stage_staging
when: manual <<: *only_tag
script: <<: *publish_site
- wget -O - https://gitlab.com/ultreiaio/pom/raw/master/bin/drop-stage.sh | sed 's/$1/ioultreia/' | bash
develop
\ No newline at end of file
master
\ No newline at end of file
jgit-flow
\ No newline at end of file
ioultreia
\ No newline at end of file
# Perform full release with no stage # Install commands
``` See [Ultreiaio/scripts](https://gitlab.com/ultreiaio/scripts/blob/master/README.md).
wget -q -O - https://gitlab.com/ultreiaio/pom/raw/master/bin/close-milestone.sh | bash
wget -q -O - https://gitlab.com/ultreiaio/pom/raw/master/bin/create-stage.sh | bash
wget -q -O - https://gitlab.com/ultreiaio/pom/raw/master/bin/close-and-release-stage.sh | sed 's/$1/ioultreia/' | bash
wget -q -O - https://gitlab.com/ultreiaio/pom/raw/master/bin/update-changelog.sh | bash
wget -q -O - https://gitlab.com/ultreiaio/pom/raw/master/bin/create-milestone.sh | bash
```
# Create Release stage
```
wget -q -O - https://gitlab.com/ultreiaio/pom/raw/master/bin/close-milestone.sh | bash
wget -q -O - https://gitlab.com/ultreiaio/pom/raw/master/bin/create-stage.sh | bash
wget -q -O - https://gitlab.com/ultreiaio/pom/raw/master/bin/close-stage.sh | sed 's/$1/ioultreia/' | bash
wget -q -O - https://gitlab.com/ultreiaio/pom/raw/master/bin/update-staging-changelog.sh | sed 's/$1/ioultreia/' | bash
wget -q -O - https://gitlab.com/ultreiaio/pom/raw/master/bin/create-milestone.sh | bash
```
# Release stage
```
wget -q -O - https://gitlab.com/ultreiaio/pom/raw/master/bin/release-stage.sh | sed 's/$1/ioultreia/' | bash
```
# Drop stage
```
wget -q -O - https://gitlab.com/ultreiaio/pom/raw/master/bin/drop-stage.sh | sed 's/$1/ioultreia/' | bash
```
# Regenerate changelog
```
wget -q -O - https://gitlab.com/ultreiaio/pom/raw/master/bin/update-changelog.sh | bash
```
# Regenerate staging changelog
```
wget -q -O - https://gitlab.com/ultreiaio/pom/raw/master/bin/update-staging-changelog.sh | sed 's/$1/ioultreia/' | bash
```
# Generate site
```
mvn clean verify site site:stage scm-publish:publish-scm -DperformRelease
```
develop
\ No newline at end of file
master
\ No newline at end of file
jgit-flow
\ No newline at end of file
ioultreia
\ No newline at end of file
...@@ -52,7 +52,7 @@ ...@@ -52,7 +52,7 @@
<dependency> <dependency>
<groupId>org.apache.servicemix.bundles</groupId> <groupId>org.apache.servicemix.bundles</groupId>
<artifactId>org.apache.servicemix.bundles.jsch</artifactId> <artifactId>org.apache.servicemix.bundles.jsch</artifactId>
<scope>runtime</scope> <scope>provided</scope>
</dependency> </dependency>
<dependency> <dependency>
<groupId>com.google.guava</groupId> <groupId>com.google.guava</groupId>
......
develop
\ No newline at end of file
master
\ No newline at end of file
jgit-flow
\ No newline at end of file
ioultreia
\ No newline at end of file
develop
\ No newline at end of file
master
\ No newline at end of file
jgit-flow
\ No newline at end of file
ioultreia
\ No newline at end of file
develop
\ No newline at end of file
master
\ No newline at end of file
jgit-flow
\ No newline at end of file
ioultreia
\ No newline at end of file
...@@ -159,11 +159,11 @@ ...@@ -159,11 +159,11 @@
<artifactId>jsch.agentproxy.core</artifactId> <artifactId>jsch.agentproxy.core</artifactId>
</dependency> </dependency>
<dependency> <!--dependency>
<groupId>org.apache.servicemix.bundles</groupId> <groupId>org.apache.servicemix.bundles</groupId>
<artifactId>org.apache.servicemix.bundles.jsch</artifactId> <artifactId>org.apache.servicemix.bundles.jsch</artifactId>
<scope>runtime</scope> <scope>runtime</scope>
</dependency> </dependency-->
<dependency> <dependency>
<groupId>org.codehaus.plexus</groupId> <groupId>org.codehaus.plexus</groupId>
<artifactId>plexus-container-default</artifactId> <artifactId>plexus-container-default</artifactId>
......
...@@ -4,7 +4,6 @@ ...@@ -4,7 +4,6 @@
# - ASL, version 2 # - ASL, version 2
# - Apache 2 # - Apache 2
# - Apache 2.0 # - Apache 2.0
# - Apache License
# - BSD License # - BSD License
# - COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (CDDL) Version 1.0 # - COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (CDDL) Version 1.0
# - Eclipse Distribution License (New BSD License) # - Eclipse Distribution License (New BSD License)
...@@ -25,11 +24,8 @@ ...@@ -25,11 +24,8 @@
# Please fill the missing licenses for dependencies : # Please fill the missing licenses for dependencies :
# #
# #
#Fri Aug 18 21:30:38 CEST 2017 #Fri Oct 20 14:31:57 CEST 2017
classworlds--classworlds--1.1=Plexus Classworlds License classworlds--classworlds--1.1=Plexus Classworlds License
jaxen--jaxen--1.1-beta-8=BSD License
jdom--jdom--1.0=The Apache Software License, Version 2.0
nekohtml--xercesMinimal--1.9.6.2=The Apache Software License, Version 2.0 nekohtml--xercesMinimal--1.9.6.2=The Apache Software License, Version 2.0
org.codehaus.plexus--plexus-container-default--1.0-alpha-9-stable-1=The Apache Software License, Version 2.0 org.codehaus.plexus--plexus-container-default--1.0-alpha-9-stable-1=The Apache Software License, Version 2.0
org.codehaus.plexus--plexus-interactivity-api--1.0-alpha-6=The Apache Software License, Version 2.0 org.codehaus.plexus--plexus-interactivity-api--1.0-alpha-6=The Apache Software License, Version 2.0
org.jdom--jdom--1.1=The Apache Software License, Version 2.0
...@@ -19,13 +19,14 @@ ...@@ -19,13 +19,14 @@
#L% #L%
--> -->
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
<parent> <parent>
<groupId>io.ultreia.maven</groupId> <groupId>io.ultreia.maven</groupId>
<artifactId>pom</artifactId> <artifactId>pom</artifactId>
<version>22</version> <version>2017.34</version>
</parent> </parent>
<groupId>io.ultreia.java4all.jgitflow</groupId> <groupId>io.ultreia.java4all.jgitflow</groupId>
...@@ -77,14 +78,14 @@ ...@@ -77,14 +78,14 @@
</modules> </modules>
<scm> <scm>
<url>https://gitlab.com/${organizationId}/${projectId}</url> <url>https://gitlab.com/${projectPath}</url>
<connection>scm:git:git@gitlab.com:${organizationId}/${projectId}.git</connection> <connection>scm:git:git@gitlab.com:${projectPath}.git</connection>
<developerConnection>scm:git:ssh://git@gitlab.com:${organizationId}/${projectId}.git</developerConnection> <developerConnection>scm:git:ssh://git@gitlab.com:${projectPath}.git</developerConnection>
</scm> </scm>
<distributionManagement> <distributionManagement>
<site> <site>
<id>gitlab.com</id> <id>gitlab.com</id>
<url>scm:git:https://git@gitlab.com/${organizationId}/${projectId}.git</url> <url>scm:git:https://git@gitlab.com/${projectPath}.git</url>
</site> </site>
</distributionManagement> </distributionManagement>
...@@ -171,6 +172,21 @@ ...@@ -171,6 +172,21 @@
<artifactId>guava</artifactId> <artifactId>guava</artifactId>
<version>20.0</version> <version>20.0</version>
</dependency> </dependency>
<dependency>
<groupId>org.apache.maven.scm</groupId>
<artifactId>maven-scm-api</artifactId>
<version>1.9.4</version>
</dependency>
<dependency>
<groupId>jaxen</groupId>
<artifactId>jaxen</artifactId>
<version>1.1-beta-8</version>
</dependency>
<dependency>
<groupId>classworlds</groupId>
<artifactId>classworlds</artifactId>
<version>1.1</version>
</dependency>
<dependency> <dependency>
<groupId>org.apache.maven</groupId> <groupId>org.apache.maven</groupId>
<artifactId>maven-core</artifactId> <artifactId>maven-core</artifactId>
...@@ -188,6 +204,10 @@ ...@@ -188,6 +204,10 @@
<groupId>org.slf4j</groupId> <groupId>org.slf4j</groupId>
<artifactId>slf4j-nop</artifactId> <artifactId>slf4j-nop</artifactId>
</exclusion> </exclusion>
<exclusion>
<groupId>org.apache.maven.wagon</groupId>
<artifactId>wagon-webdav-jackrabbit</artifactId>
</exclusion>
</exclusions> </exclusions>
</dependency> </dependency>
<dependency> <dependency>
...@@ -224,6 +244,14 @@ ...@@ -224,6 +244,14 @@
<groupId>org.apache.maven.scm</groupId> <groupId>org.apache.maven.scm</groupId>
<artifactId>maven-scm-providers-standard</artifactId> <artifactId>maven-scm-providers-standard</artifactId>
</exclusion> </exclusion>
<exclusion>
<groupId>jaxen</groupId>
<artifactId>jaxen</artifactId>
</exclusion>
<exclusion>
<groupId>org.jdom</groupId>
<artifactId>jdom</artifactId>
</exclusion>
</exclusions> </exclusions>
</dependency> </dependency>
<dependency> <dependency>
...@@ -243,6 +271,11 @@ ...@@ -243,6 +271,11 @@
<artifactId>plexus-utils</artifactId> <artifactId>plexus-utils</artifactId>
<version>3.1.0</version> <version>3.1.0</version>
</dependency> </dependency>
<dependency>
<groupId>org.codehaus.plexus</groupId>
<artifactId>plexus-interpolation</artifactId>
<version>1.24</version>
</dependency>
<dependency> <dependency>
<groupId>org.codehaus.plexus</groupId> <groupId>org.codehaus.plexus</groupId>
<artifactId>plexus-interactivity-api</artifactId> <artifactId>plexus-interactivity-api</artifactId>
...@@ -273,6 +306,11 @@ ...@@ -273,6 +306,11 @@
<artifactId>commons-lang</artifactId> <artifactId>commons-lang</artifactId>
<version>2.6</version> <version>2.6</version>
</dependency> </dependency>
<dependency>
<groupId>commons-codec</groupId>
<artifactId>commons-codec</artifactId>
<version>1.9</version>
</dependency>
<dependency> <dependency>
<groupId>org.apache.maven</groupId> <groupId>org.apache.maven</groupId>
<artifactId>maven-artifact</artifactId> <artifactId>maven-artifact</artifactId>
...@@ -367,10 +405,6 @@ ...@@ -367,10 +405,6 @@
<plugin> <plugin>
<artifactId>maven-site-plugin</artifactId> <artifactId>maven-site-plugin</artifactId>
<version>3.3</version> <version>3.3</version>
<configuration>
<topSiteURL>scm:git:https://git@gitlab.com/${organizationId}/${projectId}.git</topSiteURL>
<stagingDirectory>${user.dir}/target/staging</stagingDirectory>
</configuration>
<dependencies> <dependencies>
<dependency> <dependency>
<groupId>lt.velykis.maven.skins</groupId> <groupId>lt.velykis.maven.skins</groupId>
...@@ -384,12 +418,6 @@ ...@@ -384,12 +418,6 @@
</dependency> </dependency>
</dependencies> </dependencies>
</plugin> </plugin>
<plugin>
<artifactId>maven-scm-publish-plugin</artifactId>
<configuration>
<scmBranch>pages</scmBranch>
</configuration>
</plugin>
<plugin> <plugin>
<groupId>org.apache.maven.plugins</groupId> <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId> <artifactId>maven-surefire-plugin</artifactId>
...@@ -471,7 +499,7 @@ ...@@ -471,7 +499,7 @@
<inherited>false</inherited> <inherited>false</inherited>
<configuration> <configuration>
<issueLinkTemplatePerSystem> <issueLinkTemplatePerSystem>
<gitlab>https://gitlab.com/${organizationId}/${projectId}/issues/%ISSUE%</gitlab> <gitlab>https://gitlab.com/${projectPath}/issues/%ISSUE%</gitlab>
</issueLinkTemplatePerSystem> </issueLinkTemplatePerSystem>
<xmlPath>${project.build.directory}/generated-site/changes.xml</xmlPath> <xmlPath>${project.build.directory}/generated-site/changes.xml</xmlPath>
</configuration> </configuration>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment