refactor(container-hook-service): improve code formatting for AWS S3 commands and ensure consistent indentation
Frostebite
parent
e9af7641b7
commit
52b79b2a94
|
|
@ -5610,11 +5610,15 @@ class ContainerHookService {
|
||||||
image: amazon/aws-cli
|
image: amazon/aws-cli
|
||||||
hook: after
|
hook: after
|
||||||
commands: |
|
commands: |
|
||||||
aws configure set aws_access_key_id $AWS_ACCESS_KEY_ID --profile default
|
if command -v aws > /dev/null 2>&1; then
|
||||||
aws configure set aws_secret_access_key $AWS_SECRET_ACCESS_KEY --profile default
|
aws configure set aws_access_key_id $AWS_ACCESS_KEY_ID --profile default || true
|
||||||
aws configure set region $AWS_DEFAULT_REGION --profile default
|
aws configure set aws_secret_access_key $AWS_SECRET_ACCESS_KEY --profile default || true
|
||||||
aws s3 cp /data/cache/$CACHE_KEY/build/build-${cloud_runner_1.default.buildParameters.buildGuid}.tar${cloud_runner_1.default.buildParameters.useCompressionStrategy ? '.lz4' : ''} s3://${cloud_runner_1.default.buildParameters.awsStackName}/cloud-runner-cache/$CACHE_KEY/build/build-$BUILD_GUID.tar${cloud_runner_1.default.buildParameters.useCompressionStrategy ? '.lz4' : ''}
|
aws configure set region $AWS_DEFAULT_REGION --profile default || true
|
||||||
rm /data/cache/$CACHE_KEY/build/build-${cloud_runner_1.default.buildParameters.buildGuid}.tar${cloud_runner_1.default.buildParameters.useCompressionStrategy ? '.lz4' : ''}
|
aws s3 cp /data/cache/$CACHE_KEY/build/build-${cloud_runner_1.default.buildParameters.buildGuid}.tar${cloud_runner_1.default.buildParameters.useCompressionStrategy ? '.lz4' : ''} s3://${cloud_runner_1.default.buildParameters.awsStackName}/cloud-runner-cache/$CACHE_KEY/build/build-$BUILD_GUID.tar${cloud_runner_1.default.buildParameters.useCompressionStrategy ? '.lz4' : ''} || true
|
||||||
|
rm /data/cache/$CACHE_KEY/build/build-${cloud_runner_1.default.buildParameters.buildGuid}.tar${cloud_runner_1.default.buildParameters.useCompressionStrategy ? '.lz4' : ''} || true
|
||||||
|
else
|
||||||
|
echo "AWS CLI not available, skipping aws-s3-upload-build"
|
||||||
|
fi
|
||||||
secrets:
|
secrets:
|
||||||
- name: awsAccessKeyId
|
- name: awsAccessKeyId
|
||||||
value: ${process.env.AWS_ACCESS_KEY_ID || ``}
|
value: ${process.env.AWS_ACCESS_KEY_ID || ``}
|
||||||
|
|
@ -5625,13 +5629,17 @@ class ContainerHookService {
|
||||||
- name: aws-s3-pull-build
|
- name: aws-s3-pull-build
|
||||||
image: amazon/aws-cli
|
image: amazon/aws-cli
|
||||||
commands: |
|
commands: |
|
||||||
aws configure set aws_access_key_id $AWS_ACCESS_KEY_ID --profile default
|
|
||||||
aws configure set aws_secret_access_key $AWS_SECRET_ACCESS_KEY --profile default
|
|
||||||
aws configure set region $AWS_DEFAULT_REGION --profile default
|
|
||||||
aws s3 ls ${cloud_runner_1.default.buildParameters.awsStackName}/cloud-runner-cache/ || true
|
|
||||||
aws s3 ls ${cloud_runner_1.default.buildParameters.awsStackName}/cloud-runner-cache/$CACHE_KEY/build || true
|
|
||||||
mkdir -p /data/cache/$CACHE_KEY/build/
|
mkdir -p /data/cache/$CACHE_KEY/build/
|
||||||
aws s3 cp s3://${cloud_runner_1.default.buildParameters.awsStackName}/cloud-runner-cache/$CACHE_KEY/build/build-$BUILD_GUID_TARGET.tar${cloud_runner_1.default.buildParameters.useCompressionStrategy ? '.lz4' : ''} /data/cache/$CACHE_KEY/build/build-$BUILD_GUID_TARGET.tar${cloud_runner_1.default.buildParameters.useCompressionStrategy ? '.lz4' : ''}
|
if command -v aws > /dev/null 2>&1; then
|
||||||
|
aws configure set aws_access_key_id $AWS_ACCESS_KEY_ID --profile default || true
|
||||||
|
aws configure set aws_secret_access_key $AWS_SECRET_ACCESS_KEY --profile default || true
|
||||||
|
aws configure set region $AWS_DEFAULT_REGION --profile default || true
|
||||||
|
aws s3 ls ${cloud_runner_1.default.buildParameters.awsStackName}/cloud-runner-cache/ || true
|
||||||
|
aws s3 ls ${cloud_runner_1.default.buildParameters.awsStackName}/cloud-runner-cache/$CACHE_KEY/build || true
|
||||||
|
aws s3 cp s3://${cloud_runner_1.default.buildParameters.awsStackName}/cloud-runner-cache/$CACHE_KEY/build/build-$BUILD_GUID_TARGET.tar${cloud_runner_1.default.buildParameters.useCompressionStrategy ? '.lz4' : ''} /data/cache/$CACHE_KEY/build/build-$BUILD_GUID_TARGET.tar${cloud_runner_1.default.buildParameters.useCompressionStrategy ? '.lz4' : ''} || true
|
||||||
|
else
|
||||||
|
echo "AWS CLI not available, skipping aws-s3-pull-build"
|
||||||
|
fi
|
||||||
secrets:
|
secrets:
|
||||||
- name: AWS_ACCESS_KEY_ID
|
- name: AWS_ACCESS_KEY_ID
|
||||||
- name: AWS_SECRET_ACCESS_KEY
|
- name: AWS_SECRET_ACCESS_KEY
|
||||||
|
|
@ -5677,13 +5685,17 @@ class ContainerHookService {
|
||||||
image: amazon/aws-cli
|
image: amazon/aws-cli
|
||||||
hook: after
|
hook: after
|
||||||
commands: |
|
commands: |
|
||||||
aws configure set aws_access_key_id $AWS_ACCESS_KEY_ID --profile default
|
if command -v aws > /dev/null 2>&1; then
|
||||||
aws configure set aws_secret_access_key $AWS_SECRET_ACCESS_KEY --profile default
|
aws configure set aws_access_key_id $AWS_ACCESS_KEY_ID --profile default || true
|
||||||
aws configure set region $AWS_DEFAULT_REGION --profile default
|
aws configure set aws_secret_access_key $AWS_SECRET_ACCESS_KEY --profile default || true
|
||||||
aws s3 cp --recursive /data/cache/$CACHE_KEY/lfs s3://${cloud_runner_1.default.buildParameters.awsStackName}/cloud-runner-cache/$CACHE_KEY/lfs
|
aws configure set region $AWS_DEFAULT_REGION --profile default || true
|
||||||
rm -r /data/cache/$CACHE_KEY/lfs
|
aws s3 cp --recursive /data/cache/$CACHE_KEY/lfs s3://${cloud_runner_1.default.buildParameters.awsStackName}/cloud-runner-cache/$CACHE_KEY/lfs || true
|
||||||
aws s3 cp --recursive /data/cache/$CACHE_KEY/Library s3://${cloud_runner_1.default.buildParameters.awsStackName}/cloud-runner-cache/$CACHE_KEY/Library
|
rm -r /data/cache/$CACHE_KEY/lfs || true
|
||||||
rm -r /data/cache/$CACHE_KEY/Library
|
aws s3 cp --recursive /data/cache/$CACHE_KEY/Library s3://${cloud_runner_1.default.buildParameters.awsStackName}/cloud-runner-cache/$CACHE_KEY/Library || true
|
||||||
|
rm -r /data/cache/$CACHE_KEY/Library || true
|
||||||
|
else
|
||||||
|
echo "AWS CLI not available, skipping aws-s3-upload-cache"
|
||||||
|
fi
|
||||||
secrets:
|
secrets:
|
||||||
- name: AWS_ACCESS_KEY_ID
|
- name: AWS_ACCESS_KEY_ID
|
||||||
value: ${process.env.AWS_ACCESS_KEY_ID || ``}
|
value: ${process.env.AWS_ACCESS_KEY_ID || ``}
|
||||||
|
|
@ -5695,28 +5707,25 @@ class ContainerHookService {
|
||||||
image: amazon/aws-cli
|
image: amazon/aws-cli
|
||||||
hook: before
|
hook: before
|
||||||
commands: |
|
commands: |
|
||||||
aws configure set aws_access_key_id $AWS_ACCESS_KEY_ID --profile default
|
|
||||||
aws configure set aws_secret_access_key $AWS_SECRET_ACCESS_KEY --profile default
|
|
||||||
aws configure set region $AWS_DEFAULT_REGION --profile default
|
|
||||||
mkdir -p /data/cache/$CACHE_KEY/Library/
|
mkdir -p /data/cache/$CACHE_KEY/Library/
|
||||||
mkdir -p /data/cache/$CACHE_KEY/lfs/
|
mkdir -p /data/cache/$CACHE_KEY/lfs/
|
||||||
aws s3 ls ${cloud_runner_1.default.buildParameters.awsStackName}/cloud-runner-cache/ || true
|
if command -v aws > /dev/null 2>&1; then
|
||||||
aws s3 ls ${cloud_runner_1.default.buildParameters.awsStackName}/cloud-runner-cache/$CACHE_KEY/ || true
|
aws configure set aws_access_key_id $AWS_ACCESS_KEY_ID --profile default || true
|
||||||
BUCKET1="${cloud_runner_1.default.buildParameters.awsStackName}/cloud-runner-cache/$CACHE_KEY/Library/"
|
aws configure set aws_secret_access_key $AWS_SECRET_ACCESS_KEY --profile default || true
|
||||||
aws s3 ls $BUCKET1 || true
|
aws configure set region $AWS_DEFAULT_REGION --profile default || true
|
||||||
OBJECT1="$(aws s3 ls $BUCKET1 | sort | tail -n 1 | awk '{print $4}' || '')"
|
aws s3 ls ${cloud_runner_1.default.buildParameters.awsStackName}/cloud-runner-cache/ || true
|
||||||
aws s3 cp s3://$BUCKET1$OBJECT1 /data/cache/$CACHE_KEY/Library/ || true
|
aws s3 ls ${cloud_runner_1.default.buildParameters.awsStackName}/cloud-runner-cache/$CACHE_KEY/ || true
|
||||||
BUCKET2="${cloud_runner_1.default.buildParameters.awsStackName}/cloud-runner-cache/$CACHE_KEY/lfs/"
|
BUCKET1="${cloud_runner_1.default.buildParameters.awsStackName}/cloud-runner-cache/$CACHE_KEY/Library/"
|
||||||
aws s3 ls $BUCKET2 || true
|
aws s3 ls $BUCKET1 || true
|
||||||
OBJECT2="$(aws s3 ls $BUCKET2 | sort | tail -n 1 | awk '{print $4}' || '')"
|
OBJECT1="$(aws s3 ls $BUCKET1 | sort | tail -n 1 | awk '{print $4}' || '')"
|
||||||
aws s3 cp s3://$BUCKET2$OBJECT2 /data/cache/$CACHE_KEY/lfs/ || true
|
aws s3 cp s3://$BUCKET1$OBJECT1 /data/cache/$CACHE_KEY/Library/ || true
|
||||||
secrets:
|
BUCKET2="${cloud_runner_1.default.buildParameters.awsStackName}/cloud-runner-cache/$CACHE_KEY/lfs/"
|
||||||
- name: AWS_ACCESS_KEY_ID
|
aws s3 ls $BUCKET2 || true
|
||||||
value: ${process.env.AWS_ACCESS_KEY_ID || ``}
|
OBJECT2="$(aws s3 ls $BUCKET2 | sort | tail -n 1 | awk '{print $4}' || '')"
|
||||||
- name: AWS_SECRET_ACCESS_KEY
|
aws s3 cp s3://$BUCKET2$OBJECT2 /data/cache/$CACHE_KEY/lfs/ || true
|
||||||
value: ${process.env.AWS_SECRET_ACCESS_KEY || ``}
|
else
|
||||||
- name: AWS_DEFAULT_REGION
|
echo "AWS CLI not available, skipping aws-s3-pull-cache"
|
||||||
value: ${process.env.AWS_REGION || ``}
|
fi
|
||||||
- name: debug-cache
|
- name: debug-cache
|
||||||
image: ubuntu
|
image: ubuntu
|
||||||
hook: after
|
hook: after
|
||||||
|
|
@ -6042,7 +6051,7 @@ node ${builderPath} -m remote-cli-pre-build`;
|
||||||
return `
|
return `
|
||||||
echo "game ci start"
|
echo "game ci start"
|
||||||
echo "game ci start" >> "$LOG_FILE"
|
echo "game ci start" >> "$LOG_FILE"
|
||||||
printf '' | node ${builderPath} -m remote-cli-log-stream --logFile "$LOG_FILE"
|
timeout 3s node ${builderPath} -m remote-cli-log-stream --logFile "$LOG_FILE" || true
|
||||||
node ${builderPath} -m remote-cli-post-build`;
|
node ${builderPath} -m remote-cli-post-build`;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
||||||
File diff suppressed because one or more lines are too long
Loading…
Reference in New Issue