diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 8a8f39275b..85447f978c 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -7,73 +7,20 @@ variables: DOCKER_TLS_CERTDIR: "" include: - - local: '/ci/submitter.yml' - - local: '/ci/submission-task.yml' - - local: '/ci/pmc-processor.yml' - - local: '/ci/exporter.yml' - - local: '/ci/submission-releaser.yml' - - local: '/ci/stats-reporter.yml' - - local: '/ci/scheduler.yml' - - local: '/ci/bio-commandline.yml' - - local: '/ci/submission-handlers.yml' - local: '/ci/docker.yml' - + - local: '/ci/jobs.yml' stages: - build-test - nfs-itest - fire-itest - fire-caos-itest - - auto-deploy-dev-bio-commandline - - auto-deploy-beta-bio-commandline - - auto-deploy-prod-bio-commandline - - auto-deploy-prod-submission-task - - deploy-dev-submission-task - - deploy-beta-submission-task - - deploy-prod-submission-task - - auto-deploy-dev-submitter - - auto-deploy-beta-submitter - - auto-deploy-prod-submitter - - auto-deploy-migrator-submitter - - auto-deploy-sandbox-submitter - - auto-deploy-dev-handlers - - auto-deploy-beta-handlers - - auto-deploy-prod-handlers - - auto-deploy-sandbox-handlers - - auto-deploy-prod-scheduler - - auto-deploy-prod-exporter-task - - auto-deploy-prod-releaser-task - - auto-deploy-prod-stats-reporter-task - - auto-deploy-prod-pmc-processor-task - - deploy-dev-submitter - - deploy-beta-submitter - - deploy-prod-submitter - - deploy-migrator-submitter - - build-fat-jar-prod - - build-push-docker-image-prod - - deploy-sandbox-submitter - - deploy-dev-pmc-processor-task - - deploy-beta-pmc-processor-task - - deploy-prod-pmc-processor-task - - deploy-dev-exporter-task - - deploy-beta-exporter-task - - deploy-prod-exporter-task - - deploy-dev-releaser-task - - deploy-beta-releaser-task - - deploy-prod-releaser-task - - deploy-dev-stats-reporter-task - - deploy-beta-stats-reporter-task - - deploy-prod-stats-reporter-task - - deploy-dev-scheduler - - deploy-beta-scheduler - - deploy-prod-scheduler - - deploy-dev-bio-commandline - - deploy-beta-bio-commandline - - deploy-prod-bio-commandline - - deploy-dev-handlers - - deploy-beta-handlers - - deploy-prod-handlers - - deploy-sandbox-handlers + - auto-deploy-dev + - auto-deploy-beta + - auto-deploy-prod + - deploy-dev + - deploy-beta + - deploy-prod - build-fat-jar - build-push-docker-image diff --git a/ci/bio-commandline.yml b/ci/bio-commandline.yml deleted file mode 100644 index fb85aab221..0000000000 --- a/ci/bio-commandline.yml +++ /dev/null @@ -1,50 +0,0 @@ -.deploy-dev-bio-commandline: - dependencies: - - build-test - script: gradle deployBioCommandLine -Penv=dev -PdeployPath=$APPS_PATH/cli/dev --info - -.deploy-beta-bio-commandline: - dependencies: - - build-test - script: gradle deployBioCommandLine -Penv=beta -PdeployPath=$APPS_PATH/cli/beta - -.deploy-prod-bio-commandline: - dependencies: - - build-test - script: gradle deployBioCommandLine -Penv=prod -PdeployPath=$APPS_PATH/cli/prod - -auto-deploy-dev-bio-commandline: - extends: .deploy-dev-bio-commandline - stage: auto-deploy-dev-bio-commandline - only: - refs: - - master - -auto-deploy-beta-bio-commandline: - extends: .deploy-beta-bio-commandline - stage: auto-deploy-beta-bio-commandline - only: - refs: - - beta - -auto-deploy-prod-bio-commandline: - extends: .deploy-prod-bio-commandline - stage: auto-deploy-prod-bio-commandline - only: - refs: - - prod - -deploy-dev-bio-commandline: - extends: .deploy-dev-bio-commandline - stage: deploy-dev-bio-commandline - when: manual - -deploy-beta-bio-commandline: - extends: .deploy-beta-bio-commandline - stage: deploy-beta-bio-commandline - when: manual - -deploy-prod-bio-commandline: - extends: .deploy-prod-bio-commandline - stage: deploy-prod-bio-commandline - when: manual diff --git a/ci/exporter.yml b/ci/exporter.yml deleted file mode 100644 index b076005995..0000000000 --- a/ci/exporter.yml +++ /dev/null @@ -1,30 +0,0 @@ -.deploy-prod-exporter-task: - dependencies: - - build-test - script: gradle updateExporterArtifact -Penv=codon -PdeployPath=$CODON_APPS_PATH/scheduler/prod/apps - -auto-deploy-prod-exporter-task: - extends: .deploy-prod-exporter-task - stage: auto-deploy-prod-exporter-task - only: - refs: - - prod - -deploy-dev-exporter-task: - stage: deploy-dev-exporter-task - when: manual - dependencies: - - build-test - script: gradle updateExporterArtifact -Penv=codon -PdeployPath=$CODON_APPS_PATH/scheduler/dev/apps - -deploy-beta-exporter-task: - stage: deploy-beta-exporter-task - when: manual - dependencies: - - build-test - script: gradle updateExporterArtifact -Penv=codon -PdeployPath=$CODON_APPS_PATH/scheduler/beta/apps - -deploy-prod-exporter-task: - extends: .deploy-prod-exporter-task - stage: deploy-prod-exporter-task - when: manual diff --git a/ci/jobs.yml b/ci/jobs.yml new file mode 100644 index 0000000000..2a386857c4 --- /dev/null +++ b/ci/jobs.yml @@ -0,0 +1,85 @@ +auto-deploy-dev: + extends: .deploy-dev + stage: auto-deploy-dev + only: + refs: + - master + +deploy-dev: + extends: .deploy-dev + stage: deploy-dev + when: manual + +.deploy-dev: + dependencies: + - build-test + script: + - gradle deployBioCommandLine -Penv=dev -PdeployPath=$APPS_PATH/cli/dev + - gradle updateExporterArtifact -Penv=codon -PdeployPath=$CODON_APPS_PATH/scheduler/dev/apps + - gradle updatePmcArtifact -Penv=codon -PdeployPath=$CODON_APPS_PATH/scheduler/dev/apps + - gradle deployScheduler -Penv=dev -PdeployPath=$APPS_PATH/scheduler/dev + - gradle updateStatsReporterArtifact -Penv=codon -PdeployPath=$CODON_APPS_PATH/scheduler/dev/apps + - gradle deployHandlers -Penv=dev -PdeployPath=$APPS_PATH/handlers/dev + - gradle updateMigratorArtifact -Penv=codon -PdeployPath=$CODON_APPS_PATH/scheduler/dev/apps + - gradle updateReleaserArtifact -Penv=codon -PdeployPath=$CODON_APPS_PATH/scheduler/dev/apps + - gradle updateSubmissionTaskArtifact -Penv=dev -PdeployPath=$APPS_PATH/submitter/dev + - gradle deploySubmitter -Penv=dev -PdeployPath=$APPS_PATH/submitter/dev + +auto-deploy-beta: + extends: .deploy-beta + stage: auto-deploy-beta + only: + refs: + - beta + +deploy-beta: + extends: .deploy-beta + stage: deploy-beta + when: manual + +.deploy-beta: + dependencies: + - build-test + script: + - gradle deployBioCommandLine -Penv=beta -PdeployPath=$APPS_PATH/cli/beta + - gradle updateExporterArtifact -Penv=codon -PdeployPath=$CODON_APPS_PATH/scheduler/beta/apps + - gradle updatePmcArtifact -Penv=codon -PdeployPath=$CODON_APPS_PATH/scheduler/beta/apps + - gradle deployScheduler -Penv=beta -PdeployPath=$APPS_PATH/scheduler/beta + - gradle updateStatsReporterArtifact -Penv=codon -PdeployPath=$CODON_APPS_PATH/scheduler/beta/apps + - gradle deployHandlers -Penv=beta -PdeployPath=$APPS_PATH/handlers/beta + - gradle updateMigratorArtifact -Penv=codon -PdeployPath=$CODON_APPS_PATH/scheduler/beta/apps + - gradle updateReleaserArtifact -Penv=codon -PdeployPath=$CODON_APPS_PATH/scheduler/beta/apps + - gradle updateSubmissionTaskArtifact -Penv=beta -PdeployPath=$APPS_PATH/submitter/beta + - gradle deploySubmitter -Penv=beta -PdeployPath=$APPS_PATH/submitter/beta -PjvmParams=-Xmx12g + + +auto-deploy-prod: + extends: .deploy-prod + stage: auto-deploy-prod + only: + refs: + - prod + +deploy-prod: + extends: .deploy-prod + stage: deploy-prod + when: manual + +.deploy-prod: + dependencies: + - build-test + script: + - gradle deployBioCommandLine -Penv=prod -PdeployPath=$APPS_PATH/cli/prod + - gradle updateExporterArtifact -Penv=codon -PdeployPath=$CODON_APPS_PATH/scheduler/prod/apps + - gradle updatePmcArtifact -Penv=codon -PdeployPath=$CODON_APPS_PATH/scheduler/prod/apps + - gradle deployScheduler -Penv=prod -PdeployPath=$APPS_PATH/scheduler/prod + - gradle updateStatsReporterArtifact -Penv=codon -PdeployPath=$CODON_APPS_PATH/scheduler/prod/apps + - gradle deployHandlers -Penv=prod -PdeployPath=$APPS_PATH/handlers/prod + - gradle deployHandlers -Penv=sandbox -PdeployPath=$APPS_PATH/handlers/sandbox + - gradle updateMigratorArtifact -Penv=codon -PdeployPath=$CODON_APPS_PATH/scheduler/prod/apps + - gradle updateReleaserArtifact -Penv=codon -PdeployPath=$CODON_APPS_PATH/scheduler/prod/apps + - gradle updateSubmissionTaskArtifact -Penv=prod -PdeployPath=$APPS_PATH/submitter/prod + - gradle updateSubmissionTaskArtifact -Penv=sandbox -PdeployPath=$APPS_PATH/submitter/sandbox + - gradle deployMigratorSubmitter -Penv=prod -PdeployPath=$APPS_PATH/submitter/migrator -PjvmParams=-Xmx8g + - gradle deploySubmitter -Penv=prod -PdeployPath=$APPS_PATH/submitter/prod -PjvmParams=-Xmx16g + - gradle deploySubmitter -Penv=sandbox -PdeployPath=$APPS_PATH/submitter/sandbox -PjvmParams=-Xmx16g diff --git a/ci/pmc-processor.yml b/ci/pmc-processor.yml deleted file mode 100644 index 7d904cf98f..0000000000 --- a/ci/pmc-processor.yml +++ /dev/null @@ -1,30 +0,0 @@ -.deploy-prod-pmc-processor-task: - dependencies: - - build-test - script: gradle updatePmcArtifact -Penv=codon -PdeployPath=$CODON_APPS_PATH/scheduler/prod/apps - -auto-deploy-prod-pmc-processor-task: - extends: .deploy-prod-pmc-processor-task - stage: auto-deploy-prod-pmc-processor-task - only: - refs: - - prod - -deploy-dev-pmc-processor-task: - stage: deploy-dev-pmc-processor-task - when: manual - dependencies: - - build-test - script: gradle updatePmcArtifact -Penv=codon -PdeployPath=$CODON_APPS_PATH/scheduler/dev/apps - -deploy-beta-pmc-processor-task: - stage: deploy-beta-pmc-processor-task - when: manual - dependencies: - - build-test - script: gradle updatePmcArtifact -Penv=codon -PdeployPath=$CODON_APPS_PATH/scheduler/beta/apps - -deploy-prod-pmc-processor-task: - extends: .deploy-prod-pmc-processor-task - stage: deploy-prod-pmc-processor-task - when: manual diff --git a/ci/scheduler.yml b/ci/scheduler.yml deleted file mode 100644 index 7adb37f480..0000000000 --- a/ci/scheduler.yml +++ /dev/null @@ -1,30 +0,0 @@ -.deploy-prod-scheduler: - dependencies: - - build-test - script: gradle deployScheduler -Penv=prod -PdeployPath=$APPS_PATH/scheduler/prod - -auto-deploy-prod-scheduler: - extends: .deploy-prod-scheduler - stage: auto-deploy-prod-scheduler - only: - refs: - - prod - -deploy-dev-scheduler: - stage: deploy-dev-scheduler - when: manual - dependencies: - - build-test - script: gradle deployScheduler -Penv=dev -PdeployPath=$APPS_PATH/scheduler/dev - -deploy-beta-scheduler: - stage: deploy-beta-scheduler - when: manual - dependencies: - - build-test - script: gradle deployScheduler -Penv=beta -PdeployPath=$APPS_PATH/scheduler/beta - -deploy-prod-scheduler: - extends: .deploy-prod-scheduler - stage: deploy-prod-scheduler - when: manual diff --git a/ci/stats-reporter.yml b/ci/stats-reporter.yml deleted file mode 100644 index 8862eb5672..0000000000 --- a/ci/stats-reporter.yml +++ /dev/null @@ -1,30 +0,0 @@ -.deploy-prod-stats-reporter-task: - dependencies: - - build-test - script: gradle updateStatsReporterArtifact -Penv=codon -PdeployPath=$CODON_APPS_PATH/scheduler/prod/apps - -auto-deploy-prod-stats-reporter-task: - extends: .deploy-prod-stats-reporter-task - stage: auto-deploy-prod-stats-reporter-task - only: - refs: - - prod - -deploy-dev-stats-reporter-task: - stage: deploy-dev-stats-reporter-task - when: manual - dependencies: - - build-test - script: gradle updateStatsReporterArtifact -Penv=codon -PdeployPath=$CODON_APPS_PATH/scheduler/dev/apps - -deploy-beta-stats-reporter-task: - stage: deploy-beta-stats-reporter-task - when: manual - dependencies: - - build-test - script: gradle updateStatsReporterArtifact -Penv=codon -PdeployPath=$CODON_APPS_PATH/scheduler/beta/apps - -deploy-prod-stats-reporter-task: - extends: .deploy-prod-stats-reporter-task - stage: deploy-prod-stats-reporter-task - when: manual diff --git a/ci/submission-handlers.yml b/ci/submission-handlers.yml deleted file mode 100644 index 88842f668a..0000000000 --- a/ci/submission-handlers.yml +++ /dev/null @@ -1,67 +0,0 @@ -.deploy-dev-handlers: - dependencies: - - build-test - script: gradle deployHandlers -Penv=dev -PdeployPath=$APPS_PATH/handlers/dev - -.deploy-beta-handlers: - dependencies: - - build-test - script: gradle deployHandlers -Penv=beta -PdeployPath=$APPS_PATH/handlers/beta - -.deploy-prod-handlers: - dependencies: - - build-test - script: gradle deployHandlers -Penv=prod -PdeployPath=$APPS_PATH/handlers/prod - -.deploy-sandbox-handlers: - dependencies: - - build-test - script: gradle deployHandlers -Penv=sandbox -PdeployPath=$APPS_PATH/handlers/sandbox - -auto-deploy-dev-handlers: - extends: .deploy-dev-handlers - stage: auto-deploy-dev-handlers - only: - refs: - - master - -auto-deploy-beta-handlers: - extends: .deploy-beta-handlers - stage: auto-deploy-beta-handlers - only: - refs: - - beta - -auto-deploy-prod-handlers: - extends: .deploy-prod-handlers - stage: auto-deploy-prod-handlers - only: - refs: - - prod - -auto-deploy-sandbox-handlers: - extends: .deploy-sandbox-handlers - stage: auto-deploy-sandbox-handlers - only: - refs: - - prod - -deploy-dev-handlers: - extends: .deploy-dev-handlers - stage: deploy-dev-handlers - when: manual - -deploy-beta-handlers: - extends: .deploy-beta-handlers - stage: deploy-beta-handlers - when: manual - -deploy-prod-handlers: - extends: .deploy-prod-handlers - stage: deploy-prod-handlers - when: manual - -deploy-sandbox-handlers: - extends: .deploy-sandbox-handlers - stage: deploy-sandbox-handlers - when: manual diff --git a/ci/submission-migrator.yml b/ci/submission-migrator.yml deleted file mode 100644 index 4d54ce4093..0000000000 --- a/ci/submission-migrator.yml +++ /dev/null @@ -1,30 +0,0 @@ -.deploy-prod-submission-migrator-task: - dependencies: - - build-test - script: gradle updateMigratorArtifact -Penv=codon -PdeployPath=$CODON_APPS_PATH/scheduler/prod/apps - -auto-deploy-prod-submission-migrator-task: - extends: .deploy-prod-submission-migrator-task - stage: auto-deploy-prod-submission-migrator-task - only: - refs: - - prod - -deploy-dev-submission-migrator-task: - stage: deploy-dev-submission-migrator-task - when: manual - dependencies: - - build-test - script: gradle updateMigratorArtifact -Penv=codon -PdeployPath=$CODON_APPS_PATH/scheduler/dev/apps - -deploy-beta-submission-migrator-task: - stage: deploy-beta-submission-migrator-task - when: manual - dependencies: - - build-test - script: gradle updateMigratorArtifact -Penv=codon -PdeployPath=$CODON_APPS_PATH/scheduler/beta/apps - -deploy-prod-submission-migrator-task: - extends: .deploy-prod-submission-migrator-task - stage: deploy-prod-submission-migrator-task - when: manual diff --git a/ci/submission-releaser.yml b/ci/submission-releaser.yml deleted file mode 100644 index 3847252c62..0000000000 --- a/ci/submission-releaser.yml +++ /dev/null @@ -1,30 +0,0 @@ -.deploy-prod-releaser-task: - dependencies: - - build-test - script: gradle updateReleaserArtifact -Penv=codon -PdeployPath=$CODON_APPS_PATH/scheduler/prod/apps - -auto-deploy-prod-releaser-task: - extends: .deploy-prod-releaser-task - stage: auto-deploy-prod-releaser-task - only: - refs: - - prod - -deploy-dev-releaser-task: - stage: deploy-dev-releaser-task - when: manual - dependencies: - - build-test - script: gradle updateReleaserArtifact -Penv=codon -PdeployPath=$CODON_APPS_PATH/scheduler/dev/apps - -deploy-beta-releaser-task: - stage: deploy-beta-releaser-task - when: manual - dependencies: - - build-test - script: gradle updateReleaserArtifact -Penv=codon -PdeployPath=$CODON_APPS_PATH/scheduler/beta/apps - -deploy-prod-releaser-task: - extends: .deploy-prod-releaser-task - stage: deploy-prod-releaser-task - when: manual diff --git a/ci/submission-task.yml b/ci/submission-task.yml deleted file mode 100644 index 5f843ff3c4..0000000000 --- a/ci/submission-task.yml +++ /dev/null @@ -1,30 +0,0 @@ -.deploy-prod-submission-task: - dependencies: - - build-test - script: gradle updateSubmissionTaskArtifact -Penv=prod -PdeployPath=$APPS_PATH/submitter/prod - -auto-deploy-prod-submission-task: - extends: .deploy-prod-submission-task - stage: auto-deploy-prod-submission-task - only: - refs: - - prod - -deploy-dev-submission-task: - stage: deploy-dev-submission-task - when: manual - dependencies: - - build-test - script: gradle updateSubmissionTaskArtifact -Penv=dev -PdeployPath=$APPS_PATH/submitter/dev - -deploy-beta-submission-task: - stage: deploy-beta-submission-task - when: manual - dependencies: - - build-test - script: gradle updateSubmissionTaskArtifact -Penv=beta -PdeployPath=$APPS_PATH/submitter/beta - -deploy-prod-submission-task: - extends: .deploy-prod-submission-task - stage: deploy-prod-submission-task - when: manual diff --git a/ci/submitter.yml b/ci/submitter.yml deleted file mode 100644 index 622592e3c5..0000000000 --- a/ci/submitter.yml +++ /dev/null @@ -1,111 +0,0 @@ -.deploy-dev-submitter: - dependencies: - - build-test - script: gradle deploySubmitter -Penv=dev -PdeployPath=$APPS_PATH/submitter/dev - -.deploy-beta-submitter: - dependencies: - - build-test - script: gradle deploySubmitter -Penv=beta -PdeployPath=$APPS_PATH/submitter/beta -PjvmParams=-Xmx12g - -.deploy-prod-submitter: - dependencies: - - build-test - script: gradle deploySubmitter -Penv=prod -PdeployPath=$APPS_PATH/submitter/prod -PjvmParams=-Xmx16g - -.deploy-migrator-submitter: - dependencies: - - build-test - script: gradle deployMigratorSubmitter -Penv=prod -PdeployPath=$APPS_PATH/submitter/migrator -PjvmParams=-Xmx8g - -.deploy-sandbox-submitter: - dependencies: - - build-test - script: gradle deploySubmitter -Penv=sandbox -PdeployPath=$APPS_PATH/submitter/sandbox -PjvmParams=-Xmx16g - -auto-deploy-dev-submitter: - extends: .deploy-dev-submitter - stage: auto-deploy-dev-submitter - only: - refs: - - master - -auto-deploy-beta-submitter: - extends: .deploy-beta-submitter - stage: auto-deploy-beta-submitter - only: - refs: - - beta - -auto-deploy-prod-submitter: - extends: .deploy-prod-submitter - stage: auto-deploy-prod-submitter - only: - refs: - - prod - -auto-deploy-migrator-submitter: - extends: .deploy-migrator-submitter - stage: auto-deploy-migrator-submitter - only: - refs: - - prod - -auto-deploy-sandbox-submitter: - extends: .deploy-sandbox-submitter - stage: auto-deploy-sandbox-submitter - only: - refs: - - prod - -deploy-dev-submitter: - extends: .deploy-dev-submitter - stage: deploy-dev-submitter - when: manual - -deploy-beta-submitter: - extends: .deploy-beta-submitter - stage: deploy-beta-submitter - when: manual - -deploy-prod-submitter: - extends: .deploy-prod-submitter - stage: deploy-prod-submitter - when: manual - -deploy-migrator-submitter: - extends: .deploy-migrator-submitter - stage: deploy-migrator-submitter - when: manual - -deploy-sandbox-submitter: - extends: .deploy-sandbox-submitter - stage: deploy-sandbox-submitter - when: manual - -build-fat-jar-prod: - needs: [ "deploy-prod-submitter" ] - stage: build-fat-jar-prod - script: - - cd submission/submission-webapp - - gradle bootJar - - mkdir -p build/dependency && cd build/dependency && jar -xf ../libs/submission-webapp-1.0.0.jar - artifacts: - paths: - - submission/submission-webapp/build/dependency - -build-push-docker-image-prod: - image: docker:cli - needs: [ "build-fat-jar-prod" ] - stage: build-push-docker-image-prod - variables: - COMMIT_IMAGE: dockerhub.ebi.ac.uk/jcamilorada/biostudies-backend-service/submitter:$CI_COMMIT_SHA - LATEST_IMAGE: dockerhub.ebi.ac.uk/jcamilorada/biostudies-backend-service/submitter:latest - before_script: - - docker login $CI_REGISTRY -u $CI_REGISTRY_USER -p $CI_REGISTRY_PASSWORD - script: - - cd submission/submission-webapp - - docker build -t COMMIT_IMAGE . - - docker build -t LATEST_IMAGE . - - docker push COMMIT_IMAGE - - docker push LATEST_IMAGE