Merge pull request #629 from nasa/CUMULUS-940-2

Cumulus 940 2

.travis.yml

@@ -8,6 +8,8 @@ stages:
   - name: unit test
   - name: deploy integration test stack
   - name: integration tests
+  - name: redeployment integration tests
+    if: branch = master OR commit_message =~ \[run-redeploy-tests\] OR type != pull_request AND tag =~ ^v\d+
   - name: cleanup integration tests
   - name: deploy
     if: type != pull_request AND tag =~ ^v\d+
@@ -21,7 +23,6 @@ jobs:
       install: true
       script: ./travis-ci/build-cache.sh
 
-
     - name: "eslint"
       stage: unit test
       install:
@@ -89,6 +90,16 @@ jobs:
       script: ./travis-ci/travis_wait_new 50 ./travis-ci/run-integration-tests.sh
       after_failure: ./travis-ci/travis_wait_new 50 ./travis-ci/cleanup-integration-tests.sh
 
+    - name: "Run redeployment integration tests"
+      stage: redeployment integration tests
+      if: commit_message !~ \[skip-integration-tests\] OR branch = master
+      install:
+        - ./travis-ci/fetch-cache.sh
+        - npm install
+        - npm run bootstrap-no-build
+      script: ./travis-ci/travis_wait_new 50 ./travis-ci/run-redeployment-tests.sh
+      after_failure: ./travis-ci/travis_wait_new 50 ./travis-ci/cleanup-integration-tests.sh
+
     - name: "Cleanup integration tests"
       stage: cleanup integration tests
       if: commit_message !~ \[skip-integration-tests\] OR branch = master

README.md

@@ -7,7 +7,7 @@
 ## 📖 Documentation:
 
 - Documentation for the latest [released version](https://nasa.github.io/cumulus).
-- Documentation for the [unreleased work](https://nasa.github.io/cumulus/unreleased). 
+- Documentation for the [unreleased work](https://nasa.github.io/cumulus/unreleased).
 
 # 🔨 Development
 
@@ -87,7 +87,7 @@ Run end to end tests with
 
 For more information please [read this](docs/development/integration-tests.md).
 
-## 🔦 Code Coverage and Quality 
+## 🔦 Code Coverage and Quality
 
 For more information please [read this](docs/development/quality-and-coverage.md).
 

example/app/config.yml

@@ -233,6 +233,27 @@ lf:
       name: lf-protected-2
       type: protected
 
+lf-int-test:
+  stackName: lf-int-test
+  stackNameNoDash: lfIntTest
+
+  buckets:
+    internal:
+      name: lf-internal
+      type: internal
+    private:
+      name: lf-private
+      type: private
+    protected:
+      name: lf-protected
+      type: protected
+    public:
+      name: lf-cumulus-public
+      type: public
+    protected-2:
+      name: lf-protected-2
+      type: protected
+
 kk-uat-deployment:
   stackName: kk-test-uat
   stackNameNoDash: KkTestUat
@@ -403,3 +424,7 @@ mboyd-test:
 mboyd-int:
   stackName: mboyd-int
   stackNameNoDash: mboydInt
+
+pq:
+  stackName: pq
+  stackNameNoDash: pq

example/iam/config.yml

@@ -96,6 +96,27 @@ lf:
       name: lf-protected-2
       type: protected
 
+lf-int-test:
+  prefix: lf-int-test
+  stackName: lf-int-test-iam
+
+  buckets:
+    internal:
+      name: lf-internal
+      type: internal
+    private:
+      name: lf-private
+      type: private
+    protected:
+      name: lf-protected
+      type: protected
+    public:
+      name: lf-cumulus-public
+      type: public
+    protected-2:
+      name: lf-protected-2
+      type: protected
+
 jl:
   prefix: jl-test-integration
   buckets:
@@ -198,3 +219,6 @@ mboyd-test:
 mboyd-int:
   prefix: mboyd-int
   stackName: mboyd-int-iam
+
+pq:
+  prefix: pq

example/package.json

@@ -8,6 +8,7 @@
   },
   "scripts": {
     "test": "jasmine",
+    "redeploy-test": "jasmine spec/standalone/redeployment/*.js",
     "deploy": "./node_modules/.bin/kes cf deploy --kes-folder app --region us-east-1 --deployment $DEPLOYMENT --template node_modules/@cumulus/deployment/app --profile $AWS_PROFILE",
     "deploy-iam": "./node_modules/.bin/kes cf deploy --kes-folder iam --region us-east-1 --deployment $DEPLOYMENT --template node_modules/@cumulus/deployment/iam  --profile $AWS_PROFILE"
   },