Skip to content

Commit

Permalink
Merge pull request #1 from greenpeace/PLANET-6339
Browse files Browse the repository at this point in the history
update dev & stage hostname
  • Loading branch information
jencub authored Sep 13, 2021
2 parents 3b47a64 + 4d1e34d commit 5fc112e
Show file tree
Hide file tree
Showing 2 changed files with 23 additions and 23 deletions.
8 changes: 4 additions & 4 deletions .circleci/artifacts.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@ job_environments:
WP_DB_NAME_PREFIX: planet4-storytel_wordpress
develop_environment: &develop_environment
APP_ENVIRONMENT: development
APP_HOSTNAME: www-dev.greenpeace.org
APP_HOSTPATH: storytelling
APP_HOSTNAME: storytelling-dev.greenpeace.org
APP_HOSTPATH:
CLOUDSQL_INSTANCE: p4-develop-k8s
GOOGLE_PROJECT_ID: planet-4-151612
GCLOUD_CLUSTER: p4-development
Expand All @@ -18,8 +18,8 @@ job_environments:
GOOGLE_PROJECT_ID: planet4-production
release_environment: &release_environment
APP_ENVIRONMENT: staging
APP_HOSTNAME: www-stage.greenpeace.org
APP_HOSTPATH: storytelling
APP_HOSTNAME: storytelling-stage.greenpeace.org
APP_HOSTPATH:
CLOUDSQL_INSTANCE: planet4-prod
GCLOUD_CLUSTER: planet4-production
GOOGLE_PROJECT_ID: planet4-production
Expand Down
38 changes: 19 additions & 19 deletions .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -24,8 +24,8 @@ job_environments:
WP_DB_NAME_PREFIX: planet4-storytel_wordpress
develop_environment: &develop_environment
APP_ENVIRONMENT: development
APP_HOSTNAME: www-dev.greenpeace.org
APP_HOSTPATH: storytelling
APP_HOSTNAME: storytelling-dev.greenpeace.org
APP_HOSTPATH:
CLOUDSQL_INSTANCE: p4-develop-k8s
GOOGLE_PROJECT_ID: planet-4-151612
GCLOUD_CLUSTER: p4-development
Expand All @@ -38,8 +38,8 @@ job_environments:
GOOGLE_PROJECT_ID: planet4-production
release_environment: &release_environment
APP_ENVIRONMENT: staging
APP_HOSTNAME: www-stage.greenpeace.org
APP_HOSTPATH: storytelling
APP_HOSTNAME: storytelling-stage.greenpeace.org
APP_HOSTPATH:
CLOUDSQL_INSTANCE: planet4-prod
GCLOUD_CLUSTER: planet4-production
GOOGLE_PROJECT_ID: planet4-production
Expand Down Expand Up @@ -478,44 +478,44 @@ workflow_definitions:
workflows:
develop:
jobs:
- visualtests-reference-develop:
<<: *on_develop_commit
# - visualtests-reference-develop:
# <<: *on_develop_commit
- build-develop:
<<: *on_develop_commit
- deploy-develop:
<<: *on_develop_commit
requires:
- build-develop
- visualtests-reference-develop
# - visualtests-reference-develop
- test-develop:
<<: *on_develop_commit
requires:
- deploy-develop
- visualtests-compare-develop:
<<: *on_develop_commit
requires:
- deploy-develop
# - visualtests-compare-develop:
# <<: *on_develop_commit
# requires:
# - deploy-develop
production:
unless: << pipeline.parameters.rollback >>
jobs:
- visualtests-reference:
<<: *on_release_tag
# - visualtests-reference:
# <<: *on_release_tag
- build:
<<: *on_release_tag
- deploy-staging:
<<: *on_release_tag
requires:
- build
- visualtests-reference
# - visualtests-reference
- test-staging:
<<: *on_release_tag
requires:
- deploy-staging
- visualtests-compare:
<<: *on_release_tag
notify: true
requires:
- deploy-staging
# - visualtests-compare:
# <<: *on_release_tag
# notify: true
# requires:
# - deploy-staging
- rollback-staging:
<<: *on_release_tag
type: approval
Expand Down

0 comments on commit 5fc112e

Please sign in to comment.