Details
-
Bug
-
Resolution: Fixed
-
Medium
Description
Hi everyone,
We have 2 instances on AWS:
1 - Testing environment
2 - Production
We use BitBucket for repos and Pipeline for deploys.
Our bitbucket-pipelines.yml looks like this:
image: ruby:2.3.0
pipelines:
custom:
deployment-to-int:
- step:
script: - gem install bundler
- bundle install
- eval ssh-agent -s
- ssh-add /opt/atlassian/pipelines/agent/data/id_rsa
- bundle exec cap int deploy
deployment-to-prod: - step:
script: - gem install bundler
- bundle install
- eval ssh-agent -s
- ssh-add /opt/atlassian/pipelines/agent/data/id_rsa
- bundle exec cap production deploy
With this configuration we can choose the Env we want to deploy to.
In bitBucket we have 2 main branches:
Master & Development
We have 2 teams:
'New Features' team & 'HotFixes/Bugs' team
Steps to Deploy HotFixes on Production
'HotFixes/Bugs local branch > commit to BitBucket
Commit 'HotFixes/Bugs local branch > merge with Master
Deploy Master to Production env.
ALL GOOD !!! No prob.
The issue starts when we don't want mix Deployment branch with Master Branch.
Steps to Deploy 'New Feature' on Test env
- 'New Feature' local branch > commit to BitBucket
- Commit 'New Feature' local branch > merge with Development branch
-
- ISSUE HERE:::: Deploy Development branch to Test env without having to merge with Master
-
When we finish the deploy, Pipeline says 'Successful' but the files are not on the Test env.
The only way to see files on the Test env is to:
- Merge Dev branch with Master branch
- Deploy MAster to test
By doing the above, if the HotFix team needs to release something, they will push live the New feature.
I'm trying to understand how I can STOP this from happening.
Any help is more than welcome.
Thanks in advance.
Matt