Dop 2236 (#438)

* Update deploy-production-ec2.yml

* Update deploy-integration-ec2.yml

* Update README.md for branch consolidation

Author: casthewiz

.github/workflows/deploy-integration-ec2.yml

@@ -1,7 +1,7 @@
 on:
   push:
     branches:
-      - integration
+      - master
 name: Deploy Integration
 jobs:
   deploy-integration:
@@ -16,12 +16,12 @@ jobs:
           key: ${{ secrets.EC2_RSA_KEY }}
           known_hosts: ${{ secrets.EC2_KNOWN_HOSTS }}
           name: id_rsa
-      - name: Deploy Integration to Integration
+      - name: Deploy Master to Integration
         run: |
           ssh -l ubuntu ${{ secrets.INTEGRATION_HOST}} -T '
           cd docs-worker-pool
           git fetch origin
-          git checkout origin/integration
+          git checkout origin/master
           sudo docker system prune -af
           sudo docker build --no-cache --tag integration .
           sudo docker stop $(sudo docker ps -a -q)

.github/workflows/deploy-production-ec2.yml

@@ -29,6 +29,7 @@ jobs:
           sudo docker stop $(sudo docker ps -a -q)
           sudo sh rundocker.sh
           sudo sh rundocker.sh
+          sudo docker container prune -f
           '
   deploy-production-2:
     if: startsWith(github.ref, 'refs/tags/v')
@@ -55,5 +56,6 @@ jobs:
           sudo docker stop $(sudo docker ps -a -q)
           sudo sh rundocker.sh
           sudo sh rundocker.sh
+          sudo docker container prune -f
           '
           

README.md

@@ -52,7 +52,7 @@ npm install --dev
 See the [spec doc](https://docs.google.com/document/d/1XZOuuGmozcLQRSDitx0UWhZzJaS4opR1JVwZqDp-N4g/edit?usp=sharing) for more details.
 
 ## Branches
-Development in this repository can be done via forks or branches. Currently, we support an `integration` and `master` branch, in addition to a `meta` branch. In general, the development workflow is to open pull requests against `integration`, and to promote `integration` to `master` after testing prior to a release.
+Development in this repository can be done via forks or branches. Currently, we support a `master` branch and `meta` branch. In general, the development workflow is to open pull requests against `master`, and to test `master` prior to creating new tags for a release.
 
 In general, the git workflow within this repository loosely follows https://www.atlassian.com/git/tutorials/comparing-workflows/gitflow-workflow .
 
@@ -61,21 +61,20 @@ In general, the git workflow within this repository loosely follows https://www.
 Changes or additions to/of makefiles and .yaml for publishing purposes should be performed against this branch.
 There is no general requirement to keep `meta` up to date with `master` or `integration`.
 
-### Integration
-`integration` is treated as a running feature branch that should **always** remain up to date with `master`.
-
 ### Master
-`master` is treated as our production state branch. In general, pull requests to master should be opened only from integration or a hot-fix feature branch.
-If a change is merged into `master` that is not present in `integration`, then a contributor with push-access to `integration` should rebase `integration` with master to ensure the branches remain in sync and conflict free. 
+`master` is treated as a running pre-production feature branch. Changes should not go into master until properly tested for regressions in an acceptance environment. It is an expectation that hotfixes may have to occur on occasion - on such an occasion, a feature branch should be made from the commit hash of the last release tag, and not from the head of master. Master may contain changes that have yet to be fully tested for a production release.
+
+### Release Tags
+Each release tag represents a presumptive stable release - with the most recent release tag representing the current state of our production environment.
 
-## Releasing
-docs-worker-pool contains various triggers for release to higher environments. Currently, the repository supports an integration environment (reflecting the state of the integration branch) and a production environment (reflecting the state of the most recent release tag). 
+## Release Process
+docs-worker-pool contains various triggers for release to higher environments. Currently, the repository supports an integration environment (reflecting the state of the master branch) and a production environment (reflecting the state of the most recent release tag). 
 
-### Integration
- - Merge a pull request or otherwise push a commit to the integration branch. 
+### Integration Environment
+ - Merge a pull request or otherwise push a commit to `master` branch. 
  - Verify that the deploy-integration-ec2 workflow has executed successfully.
 
-### Production
+### Production Environment
  - Rebase `master` with `integration` and push the latest changes, or merge a pull request to `master` if performing a hotfix.
  - If you don't have push access, open an issue or otherwise contact a contributor with administrator priveliges. 
  - Create release tags. We currently follow [semver](https://semver.org/) standards.