Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Pivotal ID # 187690245: Simplify Deployment Task #841

Merged
merged 10 commits into from
May 29, 2024
Merged
Show file tree
Hide file tree
Changes from 8 commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
67 changes: 7 additions & 60 deletions .gitlab-ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
50 changes: 0 additions & 50 deletions ci/bio-commandline.yml

This file was deleted.

30 changes: 0 additions & 30 deletions ci/exporter.yml

This file was deleted.

83 changes: 83 additions & 0 deletions ci/jobs.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,83 @@
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
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Missing sandbox deployment

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
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Just realized we were missing the task deployment for the sandbox environment. We should add it here

- 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
30 changes: 0 additions & 30 deletions ci/pmc-processor.yml

This file was deleted.

30 changes: 0 additions & 30 deletions ci/scheduler.yml

This file was deleted.

30 changes: 0 additions & 30 deletions ci/stats-reporter.yml

This file was deleted.

Loading