diff --git a/.gitlab/.gitlab-ci.yml b/.gitlab/.gitlab-ci.yml index 5621f38cc..29a6e5b64 100644 --- a/.gitlab/.gitlab-ci.yml +++ b/.gitlab/.gitlab-ci.yml @@ -109,7 +109,7 @@ upload to sonarcloud: - job: run jest tests build for linux amd64: - stage: build + stage: lint image: registry.gitlab.com/molecula/featurebase/builder:0.0.3 extends: .go-cache variables: @@ -177,7 +177,7 @@ build container fb: - echo Created docker featurebase image with tag "$tag" deploy node for linux amd64: - stage: integration + stage: lint image: registry.gitlab.com/gitlab-org/cloud-deploy/aws-base:latest variables: AMI: "" @@ -204,7 +204,7 @@ 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 --filter Name=vpc-id,Values=vpc-03a4ba3d5b7c8f978 --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 + - 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 server.yml - sleep 30 - 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 diff --git a/.gitlab/server.sh b/.gitlab/server.sh deleted file mode 100755 index 5c7571b83..000000000 --- a/.gitlab/server.sh +++ /dev/null @@ -1,5 +0,0 @@ -#cloud-config -runcmd: - - sudo yum update - - sudo yum install postgresql14 - - sudo yum install golang1.16 \ No newline at end of file diff --git a/.gitlab/server.yml b/.gitlab/server.yml index 5c7571b83..3fe5243ff 100755 --- a/.gitlab/server.yml +++ b/.gitlab/server.yml @@ -1,5 +1,8 @@ #cloud-config +repo_update: true +repo_upgrade: all + runcmd: - - sudo yum update - - sudo yum install postgresql14 - - sudo yum install golang1.16 \ No newline at end of file + - yum update + - yum install postgresql + - yum install golang \ No newline at end of file