From cf016b54e859a491caa281b10466f688309dca33 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Roberto=20Bad=C3=B4?= <1571329+robertobado@users.noreply.github.com> Date: Sat, 7 Apr 2018 12:11:52 -0300 Subject: [PATCH 01/42] Initial changes to integrate with jervis --- .gitmodules | 3 ++ .jervis.yml | 56 +++++++++++++++++++ aurea-central-jervis | 1 + readme.md | 124 ++++--------------------------------------- 4 files changed, 70 insertions(+), 114 deletions(-) create mode 100644 .gitmodules create mode 100644 .jervis.yml create mode 160000 aurea-central-jervis diff --git a/.gitmodules b/.gitmodules new file mode 100644 index 000000000..cde1aede0 --- /dev/null +++ b/.gitmodules @@ -0,0 +1,3 @@ +[submodule "aurea-central-jervis"] + path = aurea-central-jervis + url = git@github.com:trilogy-group/aurea-central-jervis.git diff --git a/.jervis.yml b/.jervis.yml new file mode 100644 index 000000000..8f58709e5 --- /dev/null +++ b/.jervis.yml @@ -0,0 +1,56 @@ +####################### +# Aurea Central Jervis Example +####################### +# User guide and documentation can be found at: https://github.com/trilogy-group/aurea-central-jervis-example +# This project is based on https://github.com/aurea-central-jervis-example/aurea-central-jervis + +language: java + +env: + global: + - DOCKER_IMAGE_BASE_URL=registry2.swarm.devfactory.com/aurea/central/jervis/petclinic + - DOCKER_HOST=tcp://dlb1.aureacentral.com:2375 + +after_script: + - docker build -t ${DOCKER_IMAGE_BASE_URL}:${GIT_COMMIT} + +jenkins: + pipeline_jenkinsfile: aurea-central-jervis/pipelines/SaaS + +inventories: + dev: + - ../inventories/dev + regression: + - ../inventories/regression + qa: + - ../inventories/qa + staging: + - ../inventories/staging + release: + - ../inventories/release + +services: + ecn-web: + pre-install: + - name: Copying deploy files... + win_copy: + src: '../deploy/' + dest: 'C:/deploy' + - name: Preparing environment... + win_shell: "./setup-environment.ps1" + args: + chdir: C:/deploy/EnvironmentSetup + - name: Preparing installation... + win_shell: "./download-components.ps1" + args: + chdir: C:/deploy/PreInstall + install: + - name: Installing components... + win_shell: "./setup-components.ps1" + args: + chdir: C:/deploy/Install + post-install: + - name: Configuring components... + win_shell: "./apply-qasetup.ps1" + args: + chdir: C:/deploy/PostInstall diff --git a/aurea-central-jervis b/aurea-central-jervis new file mode 160000 index 000000000..65111f861 --- /dev/null +++ b/aurea-central-jervis @@ -0,0 +1 @@ +Subproject commit 65111f861414939695179ba04bc074363be3e440 diff --git a/readme.md b/readme.md index 66aee0c28..abf8218d0 100644 --- a/readme.md +++ b/readme.md @@ -1,120 +1,16 @@ -# Spring PetClinic Sample Application [![Build Status](https://travis-ci.org/spring-projects/spring-petclinic.png?branch=master)](https://travis-ci.org/spring-projects/spring-petclinic/) +# Aurea Central Jervis Examples -## Understanding the Spring Petclinic application with a few diagrams -See the presentation here +## Based on the original Spring's PetClinic +See original project here -## Running petclinic locally +## Getting started with Central Jervis +### 1. Clone the repository you will integrate Central Jervis with ``` - git clone https://github.com/spring-projects/spring-petclinic.git - cd spring-petclinic - ./mvnw spring-boot:run + git clone https://github.com/trilogy-group/your-project-repository.git + cd your-project-repository ``` -You can then access petclinic here: http://localhost:8080/ - -petclinic-screenshot - -## In case you find a bug/suggested improvement for Spring Petclinic -Our issue tracker is available here: https://github.com/spring-projects/spring-petclinic/issues - - -## Database configuration - -In its default configuration, Petclinic uses an in-memory database (HSQLDB) which -gets populated at startup with data. A similar setup is provided for MySql in case a persistent database configuration is needed. -Note that whenever the database type is changed, the data-access.properties file needs to be updated and the mysql-connector-java artifact from the pom.xml needs to be uncommented. - -You could start a MySql database with docker: - +### 2. Add Aurea Central Jervis repository as submodule ``` -docker run -e MYSQL_ROOT_PASSWORD=petclinic -e MYSQL_DATABASE=petclinic -p 3306:3306 mysql:5.7.8 -``` - -## Working with Petclinic in Eclipse/STS - -### prerequisites -The following items should be installed in your system: -* Apache Maven (https://maven.apache.org/install.html) -* git command line tool (https://help.github.com/articles/set-up-git) -* Eclipse with the m2e plugin (m2e is installed by default when using the STS (http://www.springsource.org/sts) distribution of Eclipse) - -Note: when m2e is available, there is an m2 icon in Help -> About dialog. -If m2e is not there, just follow the install process here: http://www.eclipse.org/m2e/m2e-downloads.html - - -### Steps: - -1) In the command line -``` -git clone https://github.com/spring-projects/spring-petclinic.git -``` -2) Inside Eclipse -``` -File -> Import -> Maven -> Existing Maven project -``` - - -## Looking for something in particular? - -|Spring Boot Configuration | Class or Java property files | -|--------------------------|---| -|The Main Class | [PetClinicApplication](https://github.com/spring-projects/spring-petclinic/blob/master/src/main/java/org/springframework/samples/petclinic/PetClinicApplication.java) | -|Properties Files | [application.properties](https://github.com/spring-projects/spring-petclinic/blob/master/src/main/resources) | -|Caching | [CacheConfig](https://github.com/spring-projects/spring-petclinic/blob/master/src/main/java/org/springframework/samples/petclinic/system/CacheConfig.java) | - -## Interesting Spring Petclinic branches and forks - -The Spring Petclinic master branch in the main -[spring-projects](https://github.com/spring-projects/spring-petclinic) -GitHub org is the "canonical" implementation, currently based on -Spring Boot and Thymeleaf. There are quite a few forks in a special -GitHub org [spring-petclinic](https://github.com/spring-petclinic). If -you have a special interest in a different technology stack that could -be used to implement the Pet Clinic then please join the community -there. - -| Link | Main technologies | -|------------------------------------|-------------------| -| [spring-framework-petclinic][] | Spring Framework XML configuration, JSP pages, 3 persistence layers: JDBC, JPA and Spring Data JPA | -| [javaconfig branch][] | Same frameworks as the [spring-framework-petclinic][] but with Java Configuration instead of XML | -| [spring-petclinic-angularjs][] | AngularJS 1.x, Spring Boot and Spring Data JPA | -| [spring-petclinic-angular][] | Angular 4 front-end of the Petclinic REST API [spring-petclinic-rest][] | -| [spring-petclinic-microservices][] | Distributed version of Spring Petclinic built with Spring Cloud | -| [spring-petclinic-reactjs][] | ReactJS (with TypeScript) and Spring Boot | -| [spring-petclinic-graphql][] | GraphQL version based on React Appolo, TypeScript and GraphQL Spring boot starter | -| [spring-petclinic-kotlin][] | Kotlin version of [spring-petclinic][] | -| [spring-petclinic-rest][] | Backend REST API | - - -## Interaction with other open source projects - -One of the best parts about working on the Spring Petclinic application is that we have the opportunity to work in direct contact with many Open Source projects. We found some bugs/suggested improvements on various topics such as Spring, Spring Data, Bean Validation and even Eclipse! In many cases, they've been fixed/implemented in just a few days. -Here is a list of them: - -| Name | Issue | -|------|-------| -| Spring JDBC: simplify usage of NamedParameterJdbcTemplate | [SPR-10256](https://jira.springsource.org/browse/SPR-10256) and [SPR-10257](https://jira.springsource.org/browse/SPR-10257) | -| Bean Validation / Hibernate Validator: simplify Maven dependencies and backward compatibility |[HV-790](https://hibernate.atlassian.net/browse/HV-790) and [HV-792](https://hibernate.atlassian.net/browse/HV-792) | -| Spring Data: provide more flexibility when working with JPQL queries | [DATAJPA-292](https://jira.springsource.org/browse/DATAJPA-292) | - - -# Contributing - -The [issue tracker](https://github.com/spring-projects/spring-petclinic/issues) is the preferred channel for bug reports, features requests and submitting pull requests. - -For pull requests, editor preferences are available in the [editor config](.editorconfig) for easy use in common text editors. Read more and download plugins at . If you have not previously done so, please fill out and submit the https://cla.pivotal.io/sign/spring[Contributor License Agreement]. - -# License - -The Spring PetClinic sample application is released under version 2.0 of the [Apache License](http://www.apache.org/licenses/LICENSE-2.0). - -[spring-petclinic]: https://github.com/spring-projects/spring-petclinic -[spring-framework-petclinic]: https://github.com/spring-petclinic/spring-framework-petclinic -[spring-petclinic-angularjs]: https://github.com/spring-petclinic/spring-petclinic-angularjs -[javaconfig branch]: https://github.com/spring-petclinic/spring-framework-petclinic/tree/javaconfig -[spring-petclinic-angular]: https://github.com/spring-petclinic/spring-petclinic-angular -[spring-petclinic-microservices]: https://github.com/spring-petclinic/spring-petclinic-microservices -[spring-petclinic-reactjs]: https://github.com/spring-petclinic/spring-petclinic-reactjs -[spring-petclinic-graphql]: https://github.com/spring-petclinic/spring-petclinic-graphql -[spring-petclinic-kotlin]: https://github.com/spring-petclinic/spring-petclinic-kotlin -[spring-petclinic-rest]: https://github.com/spring-petclinic/spring-petclinic-rest + git submodule add git@github.com:trilogy-group/aurea-central-jervis.git +``` \ No newline at end of file From 8ededb1f5be020599b33b343415d9fe1e61f8c58 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Roberto=20Bad=C3=B4?= <1571329+robertobado@users.noreply.github.com> Date: Sat, 7 Apr 2018 12:35:28 -0300 Subject: [PATCH 02/42] Removing original travis and fixing collect list in jervis --- .jervis.yml | 1 + .travis.yml | 2 -- 2 files changed, 1 insertion(+), 2 deletions(-) delete mode 100644 .travis.yml diff --git a/.jervis.yml b/.jervis.yml index 8f58709e5..04c024624 100644 --- a/.jervis.yml +++ b/.jervis.yml @@ -16,6 +16,7 @@ after_script: jenkins: pipeline_jenkinsfile: aurea-central-jervis/pipelines/SaaS + collect: [] inventories: dev: diff --git a/.travis.yml b/.travis.yml deleted file mode 100644 index c0f28cfa4..000000000 --- a/.travis.yml +++ /dev/null @@ -1,2 +0,0 @@ -language: java -jdk: oraclejdk8 From 8e2fc69224222f472d6f5f44aa438e5efe369f6d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Roberto=20Bad=C3=B4?= <1571329+robertobado@users.noreply.github.com> Date: Sat, 7 Apr 2018 12:57:47 -0300 Subject: [PATCH 03/42] Fixing collects --- .jervis.yml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/.jervis.yml b/.jervis.yml index 04c024624..f14a51cf7 100644 --- a/.jervis.yml +++ b/.jervis.yml @@ -16,7 +16,9 @@ after_script: jenkins: pipeline_jenkinsfile: aurea-central-jervis/pipelines/SaaS - collect: [] + collect: + artifacts: [] + junit: build/test-results/*.xml inventories: dev: From 7ab0b38657581adfa1651357fd70efb242686d59 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Roberto=20Bad=C3=B4?= <1571329+robertobado@users.noreply.github.com> Date: Sat, 7 Apr 2018 13:07:26 -0300 Subject: [PATCH 04/42] Fixing collects --- .jervis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.jervis.yml b/.jervis.yml index f14a51cf7..e875132d6 100644 --- a/.jervis.yml +++ b/.jervis.yml @@ -17,7 +17,7 @@ after_script: jenkins: pipeline_jenkinsfile: aurea-central-jervis/pipelines/SaaS collect: - artifacts: [] + artifacts: build/libs/*.jar junit: build/test-results/*.xml inventories: From 925c50aa66a9971ae0fb7d74f1a0068d738f21d2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Roberto=20Bad=C3=B4?= <1571329+robertobado@users.noreply.github.com> Date: Sat, 7 Apr 2018 13:27:39 -0300 Subject: [PATCH 05/42] Fixing collects --- .jervis.yml | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/.jervis.yml b/.jervis.yml index e875132d6..675ab498f 100644 --- a/.jervis.yml +++ b/.jervis.yml @@ -14,12 +14,16 @@ env: after_script: - docker build -t ${DOCKER_IMAGE_BASE_URL}:${GIT_COMMIT} +after_failure: + - 'ls -lrt' + jenkins: pipeline_jenkinsfile: aurea-central-jervis/pipelines/SaaS collect: artifacts: build/libs/*.jar - junit: build/test-results/*.xml - + junit: + - target/*.jar + - target/*.war inventories: dev: - ../inventories/dev From a01031d479248ff708ccefa35b7ee2da37254e20 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Roberto=20Bad=C3=B4?= <1571329+robertobado@users.noreply.github.com> Date: Tue, 10 Apr 2018 15:38:03 -0300 Subject: [PATCH 06/42] Cleanup and file reference path fix --- .jervis.yml | 36 +++++------------------------------- 1 file changed, 5 insertions(+), 31 deletions(-) diff --git a/.jervis.yml b/.jervis.yml index 675ab498f..1fc16bd06 100644 --- a/.jervis.yml +++ b/.jervis.yml @@ -26,38 +26,12 @@ jenkins: - target/*.war inventories: dev: - - ../inventories/dev + - ../../inventories/dev regression: - - ../inventories/regression + - ../../inventories/regression qa: - - ../inventories/qa + - ../../inventories/qa staging: - - ../inventories/staging + - ../../inventories/staging release: - - ../inventories/release - -services: - ecn-web: - pre-install: - - name: Copying deploy files... - win_copy: - src: '../deploy/' - dest: 'C:/deploy' - - name: Preparing environment... - win_shell: "./setup-environment.ps1" - args: - chdir: C:/deploy/EnvironmentSetup - - name: Preparing installation... - win_shell: "./download-components.ps1" - args: - chdir: C:/deploy/PreInstall - install: - - name: Installing components... - win_shell: "./setup-components.ps1" - args: - chdir: C:/deploy/Install - post-install: - - name: Configuring components... - win_shell: "./apply-qasetup.ps1" - args: - chdir: C:/deploy/PostInstall + - ../../inventories/release From 1a03a5ad5e7abd966395c881bdc213555e531db2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Roberto=20Bad=C3=B4?= <1571329+robertobado@users.noreply.github.com> Date: Tue, 10 Apr 2018 16:27:20 -0300 Subject: [PATCH 07/42] Testing additional labels --- .jervis.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.jervis.yml b/.jervis.yml index 1fc16bd06..876064dd8 100644 --- a/.jervis.yml +++ b/.jervis.yml @@ -19,6 +19,7 @@ after_failure: jenkins: pipeline_jenkinsfile: aurea-central-jervis/pipelines/SaaS + additional_labels: "test123" collect: artifacts: build/libs/*.jar junit: From 638b9053d699afc21c86c9a21574cf9ed02747f2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Roberto=20Bad=C3=B4?= <1571329+robertobado@users.noreply.github.com> Date: Wed, 11 Apr 2018 00:31:12 -0300 Subject: [PATCH 08/42] Removing test label --- .jervis.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.jervis.yml b/.jervis.yml index 876064dd8..1fc16bd06 100644 --- a/.jervis.yml +++ b/.jervis.yml @@ -19,7 +19,6 @@ after_failure: jenkins: pipeline_jenkinsfile: aurea-central-jervis/pipelines/SaaS - additional_labels: "test123" collect: artifacts: build/libs/*.jar junit: From 9015c544cf2cfdfb2b33d31be06a486168c86f53 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Roberto=20Bad=C3=B4?= <1571329+robertobado@users.noreply.github.com> Date: Wed, 11 Apr 2018 00:36:18 -0300 Subject: [PATCH 09/42] Adding build cache to speed up process --- .jervis.yml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/.jervis.yml b/.jervis.yml index 1fc16bd06..adc706013 100644 --- a/.jervis.yml +++ b/.jervis.yml @@ -14,8 +14,9 @@ env: after_script: - docker build -t ${DOCKER_IMAGE_BASE_URL}:${GIT_COMMIT} -after_failure: - - 'ls -lrt' +cache: + directories: + - $HOME/.m2 jenkins: pipeline_jenkinsfile: aurea-central-jervis/pipelines/SaaS From c9a7cb12cd5fd908b50d521602cd230594e7e9f4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Roberto=20Bad=C3=B4?= <1571329+robertobado@users.noreply.github.com> Date: Wed, 11 Apr 2018 01:14:43 -0300 Subject: [PATCH 10/42] Listing files if failure --- .jervis.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.jervis.yml b/.jervis.yml index adc706013..bed765294 100644 --- a/.jervis.yml +++ b/.jervis.yml @@ -14,6 +14,9 @@ env: after_script: - docker build -t ${DOCKER_IMAGE_BASE_URL}:${GIT_COMMIT} +after_failure: + - 'ls -l' + cache: directories: - $HOME/.m2 From 014f471780a90649a4b5aa29b9f77193f8bf7f5c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Roberto=20Bad=C3=B4?= <1571329+robertobado@users.noreply.github.com> Date: Wed, 11 Apr 2018 02:07:36 -0300 Subject: [PATCH 11/42] Change stash format --- .jervis.yml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/.jervis.yml b/.jervis.yml index bed765294..e5ddd6fe9 100644 --- a/.jervis.yml +++ b/.jervis.yml @@ -19,15 +19,15 @@ after_failure: cache: directories: - - $HOME/.m2 + - ${HOME}/.m2 jenkins: pipeline_jenkinsfile: aurea-central-jervis/pipelines/SaaS - collect: - artifacts: build/libs/*.jar - junit: - - target/*.jar - - target/*.war + stash: + - name: artifacts + allow_empty: true + includes: + - target/*.jar inventories: dev: - ../../inventories/dev From c1a80628ac5a83d5908ef5153d5b1b23151988f4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Roberto=20Bad=C3=B4?= <1571329+robertobado@users.noreply.github.com> Date: Wed, 11 Apr 2018 02:37:21 -0300 Subject: [PATCH 12/42] Empty stash --- .jervis.yml | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/.jervis.yml b/.jervis.yml index e5ddd6fe9..0e8a4a2ac 100644 --- a/.jervis.yml +++ b/.jervis.yml @@ -23,11 +23,7 @@ cache: jenkins: pipeline_jenkinsfile: aurea-central-jervis/pipelines/SaaS - stash: - - name: artifacts - allow_empty: true - includes: - - target/*.jar + stash: [] inventories: dev: - ../../inventories/dev From 420b8507c95b73c4cad817def23944cb56d4832b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Roberto=20Bad=C3=B4?= <1571329+robertobado@users.noreply.github.com> Date: Wed, 11 Apr 2018 02:52:05 -0300 Subject: [PATCH 13/42] Converting stash to map --- .jervis.yml | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/.jervis.yml b/.jervis.yml index 0e8a4a2ac..ca760ce6d 100644 --- a/.jervis.yml +++ b/.jervis.yml @@ -11,8 +11,8 @@ env: - DOCKER_IMAGE_BASE_URL=registry2.swarm.devfactory.com/aurea/central/jervis/petclinic - DOCKER_HOST=tcp://dlb1.aureacentral.com:2375 -after_script: - - docker build -t ${DOCKER_IMAGE_BASE_URL}:${GIT_COMMIT} +# after_script: + # - docker build -t ${DOCKER_IMAGE_BASE_URL}:${GIT_COMMIT} after_failure: - 'ls -l' @@ -23,7 +23,8 @@ cache: jenkins: pipeline_jenkinsfile: aurea-central-jervis/pipelines/SaaS - stash: [] + stash: + inventories: dev: - ../../inventories/dev From 3c1c630abc8bfbd748f710d59ee7e122a26e9c82 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Roberto=20Bad=C3=B4?= <1571329+robertobado@users.noreply.github.com> Date: Wed, 11 Apr 2018 02:52:42 -0300 Subject: [PATCH 14/42] Fixing cache --- .jervis.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.jervis.yml b/.jervis.yml index ca760ce6d..7e22f53d5 100644 --- a/.jervis.yml +++ b/.jervis.yml @@ -19,12 +19,12 @@ after_failure: cache: directories: - - ${HOME}/.m2 + - ${HOME}/.m2 jenkins: pipeline_jenkinsfile: aurea-central-jervis/pipelines/SaaS stash: - + inventories: dev: - ../../inventories/dev From 442e455b4610c6f45c0a343bb9f1101fca2113de Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Roberto=20Bad=C3=B4?= <1571329+robertobado@users.noreply.github.com> Date: Wed, 11 Apr 2018 03:14:47 -0300 Subject: [PATCH 15/42] Adding empty collector map --- .jervis.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.jervis.yml b/.jervis.yml index 7e22f53d5..9606b31db 100644 --- a/.jervis.yml +++ b/.jervis.yml @@ -13,7 +13,7 @@ env: # after_script: # - docker build -t ${DOCKER_IMAGE_BASE_URL}:${GIT_COMMIT} - +script: yes after_failure: - 'ls -l' @@ -24,6 +24,7 @@ cache: jenkins: pipeline_jenkinsfile: aurea-central-jervis/pipelines/SaaS stash: + collect: inventories: dev: From 7b5d9f4c805802dafc1437f942e1a6fbef1c3053 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Roberto=20Bad=C3=B4?= <1571329+robertobado@users.noreply.github.com> Date: Wed, 11 Apr 2018 03:19:32 -0300 Subject: [PATCH 16/42] Skipping build --- .jervis.yml | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/.jervis.yml b/.jervis.yml index 9606b31db..88b34a257 100644 --- a/.jervis.yml +++ b/.jervis.yml @@ -13,7 +13,12 @@ env: # after_script: # - docker build -t ${DOCKER_IMAGE_BASE_URL}:${GIT_COMMIT} +before_install: yes +install: yes +before_script: yes script: yes +after_script: yes + after_failure: - 'ls -l' From 4b8f4309f1bc158b21d564098272994ef2473396 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Roberto=20Bad=C3=B4?= <1571329+robertobado@users.noreply.github.com> Date: Wed, 11 Apr 2018 03:26:39 -0300 Subject: [PATCH 17/42] Empty maps --- .jervis.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.jervis.yml b/.jervis.yml index 88b34a257..0b25a24ad 100644 --- a/.jervis.yml +++ b/.jervis.yml @@ -28,8 +28,8 @@ cache: jenkins: pipeline_jenkinsfile: aurea-central-jervis/pipelines/SaaS - stash: - collect: + stash: {} + collect: {} inventories: dev: From bea261842a9094c16bca2b5a98bf08c2aaf7827e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Roberto=20Bad=C3=B4?= <1571329+robertobado@users.noreply.github.com> Date: Wed, 11 Apr 2018 03:37:20 -0300 Subject: [PATCH 18/42] Empty maps --- .jervis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.jervis.yml b/.jervis.yml index 0b25a24ad..f01458a72 100644 --- a/.jervis.yml +++ b/.jervis.yml @@ -28,7 +28,7 @@ cache: jenkins: pipeline_jenkinsfile: aurea-central-jervis/pipelines/SaaS - stash: {} + stash: [] collect: {} inventories: From 89ca6938f0c788f31add2c84d15886da9b2cbc58 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Roberto=20Bad=C3=B4?= <1571329+robertobado@users.noreply.github.com> Date: Wed, 11 Apr 2018 03:38:26 -0300 Subject: [PATCH 19/42] Empty maps --- .jervis.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.jervis.yml b/.jervis.yml index f01458a72..83365a95c 100644 --- a/.jervis.yml +++ b/.jervis.yml @@ -28,7 +28,6 @@ cache: jenkins: pipeline_jenkinsfile: aurea-central-jervis/pipelines/SaaS - stash: [] collect: {} inventories: From 13f87f8f7b9caf722c2270811fbc6d5fe05599d0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Roberto=20Bad=C3=B4?= <1571329+robertobado@users.noreply.github.com> Date: Wed, 11 Apr 2018 03:41:35 -0300 Subject: [PATCH 20/42] Empty maps --- .jervis.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.jervis.yml b/.jervis.yml index 83365a95c..1052cd43e 100644 --- a/.jervis.yml +++ b/.jervis.yml @@ -28,7 +28,8 @@ cache: jenkins: pipeline_jenkinsfile: aurea-central-jervis/pipelines/SaaS - collect: {} + collect: + collect: inventories: dev: From 04baad7e82f2ebc3264e662b6c11c23201c5dddb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Roberto=20Bad=C3=B4?= <1571329+robertobado@users.noreply.github.com> Date: Wed, 11 Apr 2018 03:48:50 -0300 Subject: [PATCH 21/42] Tree --- .jervis.yml | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/.jervis.yml b/.jervis.yml index 1052cd43e..58dad7601 100644 --- a/.jervis.yml +++ b/.jervis.yml @@ -6,6 +6,10 @@ language: java +git: + submodules: + + env: global: - DOCKER_IMAGE_BASE_URL=registry2.swarm.devfactory.com/aurea/central/jervis/petclinic @@ -13,7 +17,7 @@ env: # after_script: # - docker build -t ${DOCKER_IMAGE_BASE_URL}:${GIT_COMMIT} -before_install: yes +before_install: tree install: yes before_script: yes script: yes From 2fd380f6d190a83381b94680be6a46417e737853 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Roberto=20Bad=C3=B4?= <1571329+robertobado@users.noreply.github.com> Date: Wed, 11 Apr 2018 03:50:30 -0300 Subject: [PATCH 22/42] Tree --- .jervis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.jervis.yml b/.jervis.yml index 58dad7601..1cf089871 100644 --- a/.jervis.yml +++ b/.jervis.yml @@ -17,7 +17,7 @@ env: # after_script: # - docker build -t ${DOCKER_IMAGE_BASE_URL}:${GIT_COMMIT} -before_install: tree +before_install: 'ls -l' install: yes before_script: yes script: yes From e457182cdf2fa29d98509159d304ce87b156298f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Roberto=20Bad=C3=B4?= <1571329+robertobado@users.noreply.github.com> Date: Wed, 11 Apr 2018 03:51:52 -0300 Subject: [PATCH 23/42] Tree --- .jervis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.jervis.yml b/.jervis.yml index 1cf089871..ffa77368c 100644 --- a/.jervis.yml +++ b/.jervis.yml @@ -17,7 +17,7 @@ env: # after_script: # - docker build -t ${DOCKER_IMAGE_BASE_URL}:${GIT_COMMIT} -before_install: 'ls -l' +before_install: 'ls -l aurea-central-jervis' install: yes before_script: yes script: yes From c0e72658a3c110540a52165ed47d790b7fb1c86d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Roberto=20Bad=C3=B4?= <1571329+robertobado@users.noreply.github.com> Date: Wed, 11 Apr 2018 04:02:52 -0300 Subject: [PATCH 24/42] Update submodule --- aurea-central-jervis | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/aurea-central-jervis b/aurea-central-jervis index 65111f861..fef2605a4 160000 --- a/aurea-central-jervis +++ b/aurea-central-jervis @@ -1 +1 @@ -Subproject commit 65111f861414939695179ba04bc074363be3e440 +Subproject commit fef2605a4ef9d39c6273537347a93e7266ef877d From e757deb3410ffeb46bfb131d245fe3fb8078ee5a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Roberto=20Bad=C3=B4?= <1571329+robertobado@users.noreply.github.com> Date: Wed, 11 Apr 2018 04:09:16 -0300 Subject: [PATCH 25/42] Tree --- .jervis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.jervis.yml b/.jervis.yml index ffa77368c..956d63551 100644 --- a/.jervis.yml +++ b/.jervis.yml @@ -21,7 +21,7 @@ before_install: 'ls -l aurea-central-jervis' install: yes before_script: yes script: yes -after_script: yes +after_script: git submodule update --init --recursive after_failure: - 'ls -l' From 7e97a9d2a03582397bf0b154bb5f9ad5e168ff53 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Roberto=20Bad=C3=B4?= <1571329+robertobado@users.noreply.github.com> Date: Wed, 11 Apr 2018 04:11:27 -0300 Subject: [PATCH 26/42] Tree --- .jervis.yml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/.jervis.yml b/.jervis.yml index 956d63551..8eef19dc1 100644 --- a/.jervis.yml +++ b/.jervis.yml @@ -17,7 +17,9 @@ env: # after_script: # - docker build -t ${DOCKER_IMAGE_BASE_URL}:${GIT_COMMIT} -before_install: 'ls -l aurea-central-jervis' +before_install: + - 'ls -l aurea-central-jervis' + - 'git submodule update --init --recursive' install: yes before_script: yes script: yes From d5afcbbf27c1a22970a04efebc1103b3b97131cf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Roberto=20Bad=C3=B4?= <1571329+robertobado@users.noreply.github.com> Date: Wed, 11 Apr 2018 04:48:35 -0300 Subject: [PATCH 27/42] Tree --- .jervis.yml | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/.jervis.yml b/.jervis.yml index 8eef19dc1..7eaa64aa3 100644 --- a/.jervis.yml +++ b/.jervis.yml @@ -17,9 +17,7 @@ env: # after_script: # - docker build -t ${DOCKER_IMAGE_BASE_URL}:${GIT_COMMIT} -before_install: - - 'ls -l aurea-central-jervis' - - 'git submodule update --init --recursive' +before_install: yes install: yes before_script: yes script: yes @@ -33,7 +31,7 @@ cache: - ${HOME}/.m2 jenkins: - pipeline_jenkinsfile: aurea-central-jervis/pipelines/SaaS + # pipeline_jenkinsfile: aurea-central-jervis/pipelines/SaaS collect: collect: From f16f0b0df6bdd8b868ddc9405bcfd1cb66587371 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Roberto=20Bad=C3=B4?= <1571329+robertobado@users.noreply.github.com> Date: Wed, 11 Apr 2018 04:52:26 -0300 Subject: [PATCH 28/42] Tree --- .jervis.yml | 16 +++------------- 1 file changed, 3 insertions(+), 13 deletions(-) diff --git a/.jervis.yml b/.jervis.yml index 7eaa64aa3..c19f15ca4 100644 --- a/.jervis.yml +++ b/.jervis.yml @@ -7,7 +7,7 @@ language: java git: - submodules: + submodules: true env: @@ -15,23 +15,13 @@ env: - DOCKER_IMAGE_BASE_URL=registry2.swarm.devfactory.com/aurea/central/jervis/petclinic - DOCKER_HOST=tcp://dlb1.aureacentral.com:2375 -# after_script: - # - docker build -t ${DOCKER_IMAGE_BASE_URL}:${GIT_COMMIT} -before_install: yes -install: yes -before_script: yes -script: yes -after_script: git submodule update --init --recursive - -after_failure: - - 'ls -l' - cache: directories: - ${HOME}/.m2 +before_install: 'ls -l aurea-central-jervis' + jenkins: - # pipeline_jenkinsfile: aurea-central-jervis/pipelines/SaaS collect: collect: From f41e63ade1ddf7764bfe06c1d462757a31102541 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Roberto=20Bad=C3=B4?= <1571329+robertobado@users.noreply.github.com> Date: Thu, 12 Apr 2018 02:39:50 -0300 Subject: [PATCH 29/42] Collecting artifacts --- .jervis.yml | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/.jervis.yml b/.jervis.yml index c19f15ca4..8934a2c11 100644 --- a/.jervis.yml +++ b/.jervis.yml @@ -19,11 +19,12 @@ cache: directories: - ${HOME}/.m2 -before_install: 'ls -l aurea-central-jervis' - jenkins: collect: - collect: + artifacts: target/*.jar + junit: + - target/surfire-results/*.xml + - target/surfire-results/*.txt inventories: dev: From f5e8937b67b67589273e512105739ccf8cc11add Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Roberto=20Bad=C3=B4?= <1571329+robertobado@users.noreply.github.com> Date: Thu, 12 Apr 2018 02:56:23 -0300 Subject: [PATCH 30/42] Stashing artifacts --- .jervis.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.jervis.yml b/.jervis.yml index 8934a2c11..bde6c1e67 100644 --- a/.jervis.yml +++ b/.jervis.yml @@ -20,6 +20,9 @@ cache: - ${HOME}/.m2 jenkins: + stash: + - artifacts + - junit collect: artifacts: target/*.jar junit: From e78bf0577d6a03fd881dff4c4eb8cfadbe2984cb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Roberto=20Bad=C3=B4?= <1571329+robertobado@users.noreply.github.com> Date: Thu, 12 Apr 2018 03:19:36 -0300 Subject: [PATCH 31/42] Stashing artifacts --- .jervis.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.jervis.yml b/.jervis.yml index bde6c1e67..d5ea97416 100644 --- a/.jervis.yml +++ b/.jervis.yml @@ -21,8 +21,8 @@ cache: jenkins: stash: - - artifacts - - junit + artifacts: + junit: collect: artifacts: target/*.jar junit: From 52aa6001db73eff58d6efde2b333ced0518abe22 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Roberto=20Bad=C3=B4?= <1571329+robertobado@users.noreply.github.com> Date: Thu, 12 Apr 2018 03:30:05 -0300 Subject: [PATCH 32/42] Stashing artifacts --- .gitmodules | 1 + .jervis.yml | 3 +-- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.gitmodules b/.gitmodules index cde1aede0..4831fe491 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,3 +1,4 @@ [submodule "aurea-central-jervis"] path = aurea-central-jervis url = git@github.com:trilogy-group/aurea-central-jervis.git + branch = master diff --git a/.jervis.yml b/.jervis.yml index d5ea97416..ab5b823f4 100644 --- a/.jervis.yml +++ b/.jervis.yml @@ -26,8 +26,7 @@ jenkins: collect: artifacts: target/*.jar junit: - - target/surfire-results/*.xml - - target/surfire-results/*.txt + - target inventories: dev: From f97e1b6ebd40e1ad74afb43ffdb5d126a67ce59b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Roberto=20Bad=C3=B4?= <1571329+robertobado@users.noreply.github.com> Date: Thu, 12 Apr 2018 03:38:12 -0300 Subject: [PATCH 33/42] Stashing artifacts --- .jervis.yml | 3 --- 1 file changed, 3 deletions(-) diff --git a/.jervis.yml b/.jervis.yml index ab5b823f4..0b5245e1c 100644 --- a/.jervis.yml +++ b/.jervis.yml @@ -22,11 +22,8 @@ cache: jenkins: stash: artifacts: - junit: collect: artifacts: target/*.jar - junit: - - target inventories: dev: From 820cdb6010b9fd8f4d7c7c9d8cc386116afbd389 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Roberto=20Bad=C3=B4?= <1571329+robertobado@users.noreply.github.com> Date: Thu, 12 Apr 2018 03:48:49 -0300 Subject: [PATCH 34/42] Stashing artifacts --- .jervis.yml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/.jervis.yml b/.jervis.yml index 0b5245e1c..967d0c2b8 100644 --- a/.jervis.yml +++ b/.jervis.yml @@ -19,6 +19,10 @@ cache: directories: - ${HOME}/.m2 +after_success: + - ls -lrt target/ + - sleep 1000 + jenkins: stash: artifacts: From f653c962bb64ef79715cc49fe7fe9413cd43328d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Roberto=20Bad=C3=B4?= <1571329+robertobado@users.noreply.github.com> Date: Thu, 12 Apr 2018 03:53:02 -0300 Subject: [PATCH 35/42] Stashing artifacts --- .jervis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.jervis.yml b/.jervis.yml index 967d0c2b8..3a02f1260 100644 --- a/.jervis.yml +++ b/.jervis.yml @@ -19,7 +19,7 @@ cache: directories: - ${HOME}/.m2 -after_success: +after_script: - ls -lrt target/ - sleep 1000 From 5d97732070a5610857b642a672e5c005a94ca44c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Roberto=20Bad=C3=B4?= <1571329+robertobado@users.noreply.github.com> Date: Thu, 12 Apr 2018 10:28:14 -0300 Subject: [PATCH 36/42] Stashing artifacts --- .jervis.yml | 39 ++++++++++++++++----------------------- 1 file changed, 16 insertions(+), 23 deletions(-) diff --git a/.jervis.yml b/.jervis.yml index 3a02f1260..dcb0eeffa 100644 --- a/.jervis.yml +++ b/.jervis.yml @@ -8,35 +8,28 @@ language: java git: submodules: true - - -env: - global: - - DOCKER_IMAGE_BASE_URL=registry2.swarm.devfactory.com/aurea/central/jervis/petclinic - - DOCKER_HOST=tcp://dlb1.aureacentral.com:2375 cache: directories: - ${HOME}/.m2 -after_script: - - ls -lrt target/ - - sleep 1000 - jenkins: stash: - artifacts: + artifacts: target/* collect: - artifacts: target/*.jar + artifacts: target/* -inventories: - dev: - - ../../inventories/dev - regression: - - ../../inventories/regression - qa: - - ../../inventories/qa - staging: - - ../../inventories/staging - release: - - ../../inventories/release +services: + petclinc: + docker_login: + username: electricflow + password: !vault | + $ANSIBLE_VAULT;1.1;AES256 + 34373161303764653863383637376231393862643634646535666232636635386437353163363934 + 3866303939316462313939303230323534313238323832340a666637366338333033643733303038 + 66633263616462323766323364663835376438666663616566643739373936633964346565613363 + 3264653436303761350a613565663463386139303131393035663332653336393362366266316139 + 3034 + docker_image: + path: . + name: registry2.swarm.devfactory.com/aurea/central/jervis/petclinic From 67cadb1b03c97a9a013e8c1c4f8b6b62d2362b2a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Roberto=20Bad=C3=B4?= <1571329+robertobado@users.noreply.github.com> Date: Thu, 12 Apr 2018 11:10:41 -0300 Subject: [PATCH 37/42] Stashing artifacts --- .jervis.yml | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/.jervis.yml b/.jervis.yml index dcb0eeffa..586214945 100644 --- a/.jervis.yml +++ b/.jervis.yml @@ -9,6 +9,14 @@ language: java git: submodules: true +branches: + only: + - master + - develop + - release + - hotfix + - /^feature\/.*$/ + cache: directories: - ${HOME}/.m2 From d1bfb82ccbfd91cc77f0475f187d362d124142ec Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Roberto=20Bad=C3=B4?= <1571329+robertobado@users.noreply.github.com> Date: Thu, 12 Apr 2018 11:15:06 -0300 Subject: [PATCH 38/42] Stashing artifacts --- .jervis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.jervis.yml b/.jervis.yml index 586214945..961adc19d 100644 --- a/.jervis.yml +++ b/.jervis.yml @@ -15,7 +15,7 @@ branches: - develop - release - hotfix - - /^feature\/.*$/ + - feature/.*$ cache: directories: From 3c7aff0dca14ae370889c3a41789fec82e24e0fe Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Roberto=20Bad=C3=B4?= <1571329+robertobado@users.noreply.github.com> Date: Thu, 12 Apr 2018 11:17:21 -0300 Subject: [PATCH 39/42] Stashing artifacts --- .jervis.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.jervis.yml b/.jervis.yml index 961adc19d..339550658 100644 --- a/.jervis.yml +++ b/.jervis.yml @@ -13,9 +13,9 @@ branches: only: - master - develop - - release - - hotfix - - feature/.*$ + - release/* + - hotfix/* + - feature/* cache: directories: From cd4f6aa787d857032250fb7286530d9232cc77b5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Roberto=20Bad=C3=B4?= <1571329+robertobado@users.noreply.github.com> Date: Thu, 12 Apr 2018 11:23:29 -0300 Subject: [PATCH 40/42] Stashing artifacts --- .jervis.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.jervis.yml b/.jervis.yml index 339550658..7e650795d 100644 --- a/.jervis.yml +++ b/.jervis.yml @@ -31,13 +31,13 @@ services: petclinc: docker_login: username: electricflow - password: !vault | + password: "!vault | $ANSIBLE_VAULT;1.1;AES256 34373161303764653863383637376231393862643634646535666232636635386437353163363934 3866303939316462313939303230323534313238323832340a666637366338333033643733303038 66633263616462323766323364663835376438666663616566643739373936633964346565613363 3264653436303761350a613565663463386139303131393035663332653336393362366266316139 - 3034 + 3034" docker_image: path: . name: registry2.swarm.devfactory.com/aurea/central/jervis/petclinic From 44179eca6e8655f7613e314831b4abca5c2c2154 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Roberto=20Bad=C3=B4?= <1571329+robertobado@users.noreply.github.com> Date: Thu, 12 Apr 2018 11:27:39 -0300 Subject: [PATCH 41/42] Whitelisting other branches --- .jervis.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.jervis.yml b/.jervis.yml index 7e650795d..c32ac415e 100644 --- a/.jervis.yml +++ b/.jervis.yml @@ -13,9 +13,9 @@ branches: only: - master - develop - - release/* - - hotfix/* - - feature/* + - release* + - hotfix* + - feature* cache: directories: From b0f472fd27aa3ab8cee5f08646d7bac5d675895a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Roberto=20Bad=C3=B4?= <1571329+robertobado@users.noreply.github.com> Date: Thu, 12 Apr 2018 11:41:12 -0300 Subject: [PATCH 42/42] Whitelisting other branches --- .jervis.yml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/.jervis.yml b/.jervis.yml index c32ac415e..7bd9eea9d 100644 --- a/.jervis.yml +++ b/.jervis.yml @@ -11,11 +11,11 @@ git: branches: only: - - master - - develop - - release* - - hotfix* - - feature* + - master + - develop + - release/* + - hotfix/* + - feature/* cache: directories: