From 442d109814ab58fd108b9d42bca4fd760ba798bd Mon Sep 17 00:00:00 2001 From: Todd Gruben Date: Thu, 18 Nov 2021 10:28:49 -0600 Subject: [PATCH] created qa folder --- .gitlab/.gitlab-ci.yml | 6 +++--- {.gitlab => qa/scripts}/cloud-init.sh | 0 {.gitlab => qa/scripts}/configureFeatureBase.json | 0 {.gitlab => qa/scripts}/featurebase.conf | 0 {.gitlab => qa/scripts}/featurebase.service | 0 {.gitlab => qa/scripts}/ingestWorkload.sh | 0 {.gitlab => qa/simulacraData}/simulacraData.go | 0 7 files changed, 3 insertions(+), 3 deletions(-) rename {.gitlab => qa/scripts}/cloud-init.sh (100%) rename {.gitlab => qa/scripts}/configureFeatureBase.json (100%) rename {.gitlab => qa/scripts}/featurebase.conf (100%) rename {.gitlab => qa/scripts}/featurebase.service (100%) rename {.gitlab => qa/scripts}/ingestWorkload.sh (100%) rename {.gitlab => qa/simulacraData}/simulacraData.go (100%) diff --git a/.gitlab/.gitlab-ci.yml b/.gitlab/.gitlab-ci.yml index ccd710889..82710bb4d 100644 --- a/.gitlab/.gitlab-ci.yml +++ b/.gitlab/.gitlab-ci.yml @@ -225,15 +225,15 @@ deploy node for linux amd64: - AMI=$(aws ssm get-parameters --names /aws/service/ami-amazon-linux-latest/amzn2-ami-hvm-x86_64-ebs --query 'Parameters[0].[Value]' --output text --profile $PROFILE) - SECURITY_GROUP=$(aws ec2 describe-security-groups --filters Name=vpc-id,Values=vpc-03a4ba3d5b7c8f978 Name=group-name,Values=default --query 'SecurityGroups[*].[GroupId]' --output text --profile $PROFILE) - SUBNET_ID=$(aws ec2 describe-subnets --filters 'Name=vpc-id,Values=vpc-03a4ba3d5b7c8f978' 'Name=availability-zone,Values=us-east-2a' --query 'Subnets[0].SubnetId' --output text --profile $PROFILE) - - aws ec2 run-instances --image-id $AMI --instance-type $INSTANCE --security-group-ids $SECURITY_GROUP --subnet-id $SUBNET_ID --key-name gitlab-featurebase-dev --tag-specifications 'ResourceType=instance,Tags=[{Key=Name,Value=linux-amd64-node}]' --profile $PROFILE --user-data file://.gitlab/cloud-init.sh --iam-instance-profile Name=featurebase-dev-ssm + - aws ec2 run-instances --image-id $AMI --instance-type $INSTANCE --security-group-ids $SECURITY_GROUP --subnet-id $SUBNET_ID --key-name gitlab-featurebase-dev --tag-specifications 'ResourceType=instance,Tags=[{Key=Name,Value=linux-amd64-node}]' --profile $PROFILE --user-data file://./qa/scripts/cloud-init.sh --iam-instance-profile Name=featurebase-dev-ssm - sleep 120 # Need to wait for the EC2 instance to launch and run the initialization commands passed through user-data - PUBLIC_IP=$(aws ec2 describe-instances --filters 'Name=tag:Name, Values=linux-amd64-node' 'Name=instance-state-name, Values=running' --query 'Reservations[*].Instances[*].PublicIpAddress' --output text --profile $PROFILE) - echo $PUBLIC_IP - INSTANCE_ID=$(aws ec2 describe-instances --filters 'Name=tag:Name, Values=linux-amd64-node' 'Name=instance-state-name, Values=running' --query 'Reservations[*].Instances[*].InstanceId' --output text --profile $PROFILE) - echo $INSTANCE_ID > linux-amd64-instance.txt - scp -o StrictHostKeyChecking=no -i gitlab-featurebase-dev.pem featurebase_linux_amd64 ec2-user@$PUBLIC_IP:. - - scp -o StrictHostKeyChecking=no -i gitlab-featurebase-dev.pem .gitlab/featurebase.conf .gitlab/featurebase.service ec2-user@$PUBLIC_IP:. - - aws ssm send-command --document-name "AWS-RunShellScript" --instance-ids $INSTANCE_ID --cli-input-json file://.gitlab/configureFeatureBase.json --profile $PROFILE --region us-east-2 + - scp -o StrictHostKeyChecking=no -i gitlab-featurebase-dev.pem ./qa/scripts/featurebase.conf ./qa/scripts/featurebase.service ec3-user@$PUBLIC_IP:. + - aws ssm send-command --document-name "AWS-RunShellScript" --instance-ids $INSTANCE_ID --cli-input-json file://./qa/scripts/configureFeatureBase.json --profile $PROFILE --region us-east-2 needs: - job: build for linux amd64 artifacts: diff --git a/.gitlab/cloud-init.sh b/qa/scripts/cloud-init.sh similarity index 100% rename from .gitlab/cloud-init.sh rename to qa/scripts/cloud-init.sh diff --git a/.gitlab/configureFeatureBase.json b/qa/scripts/configureFeatureBase.json similarity index 100% rename from .gitlab/configureFeatureBase.json rename to qa/scripts/configureFeatureBase.json diff --git a/.gitlab/featurebase.conf b/qa/scripts/featurebase.conf similarity index 100% rename from .gitlab/featurebase.conf rename to qa/scripts/featurebase.conf diff --git a/.gitlab/featurebase.service b/qa/scripts/featurebase.service similarity index 100% rename from .gitlab/featurebase.service rename to qa/scripts/featurebase.service diff --git a/.gitlab/ingestWorkload.sh b/qa/scripts/ingestWorkload.sh similarity index 100% rename from .gitlab/ingestWorkload.sh rename to qa/scripts/ingestWorkload.sh diff --git a/.gitlab/simulacraData.go b/qa/simulacraData/simulacraData.go similarity index 100% rename from .gitlab/simulacraData.go rename to qa/simulacraData/simulacraData.go