Revert temp amazon-linux2 defaults. To be extracted to configs later on.

shinesolutions · Nov 26, 2018 · 1b69c36 · 1b69c36
1 parent f7345cc
commit 1b69c36
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 3 deletions.
diff --git a/cloudformation/apps/aem/consolidated/main.yaml b/cloudformation/apps/aem/consolidated/main.yaml
@@ -29,7 +29,7 @@ Parameters:
     Description: AMI Id used for the Host
     Type: AWS::EC2::Image::Id
   AuthorPublishDispatcherImageRootDevice:
-    Default: /dev/xvda
+    Default: /dev/sda1
     Description: The root device name for the Author Publish Dispatcher Image Id
     Type: String
   AuthorPublishDispatcherInstanceTypeParameter:
@@ -88,7 +88,7 @@ Resources:
           VolumeSize:
             Ref: AuthorPublishDispatcherRootVolSizeParameter
           VolumeType: gp2
-      - DeviceName: /dev/xvdb
+      - DeviceName: /dev/sdb
         Ebs:
           DeleteOnTermination: true
           SnapshotId:
@@ -99,7 +99,7 @@ Resources:
           VolumeSize:
             Ref: AuthorPublishDispatcherDataVolSizeParameter
           VolumeType: gp2
-      - DeviceName: /dev/xvdc
+      - DeviceName: /dev/sdc
         Ebs:
           DeleteOnTermination: true
           SnapshotId:

diff --git a/test/integration/test-examples.sh b/test/integration/test-examples.sh
@@ -33,7 +33,14 @@ tar -xvzf "stage/aem-stack-manager-messenger-${aem_stack_manager_messenger_versi
 cd "${workspace_dir}/stage/aem-stack-manager-messenger-${aem_stack_manager_messenger_version}"
 make deps
 
+# Run Stack Manager Messenger integration tests
+cd "${workspace_dir}"
+wget "https://github.com/shinesolutions/aem-stack-manager-messenger/releases/download/${aem_stack_manager_messenger_version}/aem-stack-manager-messenger-${aem_stack_manager_messenger_version}.tar.gz" --directory-prefix=stage
+mkdir -p "stage/aem-stack-manager-messenger-${aem_stack_manager_messenger_version}"
+tar -xvzf "stage/aem-stack-manager-messenger-${aem_stack_manager_messenger_version}.tar.gz" --directory "stage/aem-stack-manager-messenger-${aem_stack_manager_messenger_version}"
+
 # Run integration tests via Stack Manager Messenger
+cd "${workspace_dir}/stage/aem-stack-manager-messenger-${aem_stack_manager_messenger_version}"
 make test-consolidated \
   "stack_prefix=${test_id}-sm" \
   "target_aem_stack_prefix=${test_id}-con"