Merged branch 'main' into 'github'

aws · Jun 27, 2022 · a8f1113 · a8f1113
2 parents a5a10ce + 4da69a2
commit a8f1113
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 4 deletions.
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
@@ -211,5 +211,5 @@ release:
     - *default-run-condition
   script:
     # Create release package
-    - tar -cvf ../aws-connected-device-framework.tar --exclude=.git  --exclude=deploy --exclude=.history --exclude=temp .
+    - tar -cvf ../aws-connected-device-framework.tar --exclude=.git --exclude=node_modules --exclude=deploy --exclude=.history --exclude=temp .
     - 'curl --header "JOB-TOKEN: $CI_JOB_TOKEN" --upload-file ../aws-connected-device-framework.tar "${CI_API_V4_URL}/projects/${CI_PROJECT_ID}/packages/generic/aws-connected-device-framework/${CI_JOB_ID}/aws-connected-device-framework.tar"'
diff --git a/source/cicd/integrationtestsproject_build.bash b/source/cicd/integrationtestsproject_build.bash
@@ -103,15 +103,16 @@ cd source/packages/integration-tests
 npm config set @cdf/integration-tests:environment $ENVIRONMENT
 npm run clean
 npm run build
+npm run integration-test -- "features/commandandcontrol/*.feature"
+npm run integration-test -- "features/greengrass2-provisioning/*.feature"
 npm run integration-test -- "features/device-patcher/*.feature"
 npm run integration-test -- "features/provisioning/*.feature"
 npm run integration-test -- "features/assetlibrary/$ASSETLIBRARY_MODE/*.feature"
 # TODO: fix asset library history tests
 #npm run integration-test -- "features/assetlibraryhistory/*.feature"
-npm run integration-test -- "features/greengrass2-provisioning/*.feature"
 npm run integration-test -- "features/bulkcerts/*.feature"
 npm run integration-test -- "features/commands/*.feature"
 npm run integration-test -- "features/notifications/*.feature"
-npm run integration-test -- "features/commandandcontrol/*.feature"
+
 
 
diff --git a/source/docs/deployment.md b/source/docs/deployment.md
@@ -57,10 +57,15 @@ If an authentication mechanism is applied to the CDF REST API's, a security peri
 ### Deploying from pre-bundled releases
 Each github release comes with a pre-bundled release artifact that can be used to simplify the deployment.
 
+Download the latest release tar files from [here](https://github.com/aws/aws-connected-device-framework/releases)
+
+Run below step in the folder where you downloaded the tar file:
+
 ```shell
 mkdir aws-connected-device-framework
 tar -xvf aws-connected-device-framework.tar -C aws-connected-device-framework
-aws-connected-device-framework> cd source
+cd aws-connected-device-framework/source
+aws-connected-device-framework> rush update
 ```
 **You can now skip to the `Deploying` step**