Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: ecb31935 by Tony CHEMIT at 2017-10-19T23:26:10+02:00 use new jobs api - - - - - 2 changed files: - .gitlab-ci.yml - CONTRIBUTING.md Changes: ===================================== .gitlab-ci.yml ===================================== --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -1,9 +1,19 @@ -image: registry.gitlab.com/ultreiaio/docker/ird-observe:latest - stages: + - Docker - Build - Test - Staging +image: registry.gitlab.com/ultreiaio/ird-observe/docker:latest +docker: + stage: Docker + image: registry.gitlab.com/ultreiaio/docker/docker:latest + services: + - docker:dind + script: + - ultreiaio-docker-generate-image gitlab-ci-token $CI_BUILD_TOKEN + only: + - develop + when: manual .env_test: &env_test environment: @@ -23,13 +33,13 @@ stages: .deploy_site: &deploy_site script: - - maven-execute 'clean install -DskipTests' - - maven-execute 'site -DperformRelease scm-publish:publish-scm' + - ultreiaio-maven-execute 'clean install -DskipTests' + - ultreiaio-maven-execute 'site -DperformRelease scm-publish:publish-scm' .deploy_demo_latest: &deploy_demo_latest stage: Test script: - - war-deploy-latest-to-demo 'server' + - ultreiaio-war-deploy-latest-to-demo 'server' .nightly: &nightly only: @@ -44,7 +54,7 @@ stages: build: stage: Build script: - - maven-execute 'verify -DskipTests' + - ultreiaio-maven-execute 'verify -DskipTests' only: - develop - feature/* @@ -55,30 +65,30 @@ stage: <<: *env_staging <<: *test_manual script: - - release-gitlab-init ${CI_PROJECT_PATH} ${GITLAB_USER_ID} ${GITLAB_USER_EMAIL} - - milestone-close - - release-start - - release-finish - - stage-drop - - changelog-update-staging - - milestone-create + - ultreiaio-release-gitlab-init + - ultreiaio-milestone-close + - ultreiaio-release-start + - ultreiaio-release-finish + - ultreiaio-stage-drop + - ultreiaio-changelog-update-staging + - ultreiaio-milestone-create release: <<: *env_staging <<: *test_manual script: - - release-gitlab-init ${CI_PROJECT_PATH} ${GITLAB_USER_ID} ${GITLAB_USER_EMAIL} - - milestone-close - - release-start - - release-finish - - stage-close-and-release - - changelog-update - - milestone-create + - ultreiaio-release-gitlab-init + - ultreiaio-milestone-close + - ultreiaio-release-start + - ultreiaio-release-finish + - ultreiaio-stage-close-and-release + - ultreiaio-changelog-update + - ultreiaio-milestone-create staging-demo: <<: *staging script: - - war-deploy-to-demo 'server' + - ultreiaio-war-deploy-to-demo 'server' staging-site: <<: *staging @@ -90,11 +100,11 @@ stage-release: script: - stage-release -stage-drop: +ultreiaio-stage-drop: <<: *staging when: manual script: - - stage-drop + - ultreiaio-stage-drop latest-site: <<: *env_test @@ -110,7 +120,7 @@ nightly-build: stage: Build <<: *nightly script: - - maven-execute 'verify -DperformRelease' + - ultreiaio-maven-execute 'verify -DperformRelease' nightly-site: stage: Test @@ -119,7 +129,6 @@ nightly-site: <<: *deploy_site nightly-demo: - stage: Test <<: *env_test <<: *nightly <<: *deploy_demo_latest ===================================== CONTRIBUTING.md ===================================== --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -1,68 +1,63 @@ # Install commands -To be able to use some usefull commands, please run this unique command. It will create a **~/ultreiaio** directory -with some nice bash scripts. - -``` -wget -q -O - https://gitlab.com/ultreiaio/pom/raw/develop/bin/install.sh | bash -``` +See [Ultreiaio/scripts](https://gitlab.com/ultreiaio/scripts/blob/master/README.md). # Perform full release with no stage ``` -bash ~/ultreiaio/milestone-close.sh -bash ~/ultreiaio/release-start.sh -bash ~/ultreiaio/release-finish.sh -bash ~/ultreiaio/stage-close-and-release.sh -bash ~/ultreiaio/changelog-update.sh -bash ~/ultreiaio/milestone-create.sh +ultreiaio-milestone-close +ultreiaio-release-start +ultreiaio-release-finish +ultreiaio-stage-close-and-release +ultreiaio-changelog-update +ultreiaio-milestone-create ``` # Create Release stage ``` -bash ~/ultreiaio/milestone-close.sh -bash ~/ultreiaio/release-start.sh -bash ~/ultreiaio/release-finish.sh -bash ~/ultreiaio/stage-drop.sh -bash ~/ultreiaio/changelog-update-staging.sh -bash ~/ultreiaio/milestone-create.sh +ultreiaio-milestone-close +ultreiaio-release-start +ultreiaio-release-finish +ultreiaio-stage-drop +ultreiaio-changelog-update-staging +ultreiaio-milestone-create ``` # Release stage ``` -bash ~/ultreiaio/stage-release.sh +stage-release ``` # Drop stage ``` -bash ~/ultreiaio/stage-drop.sh +ultreiaio-stage-drop ``` # Regenerate changelog ``` -bash ~/ultreiaio/changelog-update.sh +ultreiaio-changelog-update ``` # Regenerate staging changelog ``` -bash ~/ultreiaio/changelog-update-staging.sh +ultreiaio-changelog-update-staging ``` # Generate site ``` -bash ~/ultreiaio/simple-site-publish.sh +site-mono-module-publish ``` # Deploy latest demo ``` -bash ~/ultreiaio/war-deploy-latest-to-demo 'server' +ultreiaio-war-deploy-latest-to-demo 'server' ``` View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/ecb31935295fe516e878603b6b49... --- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/ecb31935295fe516e878603b6b49... You're receiving this email because of your account on gitlab.com.