From 8aa444e4b7dad44ac89e3ca69667bb97a6b414ed Mon Sep 17 00:00:00 2001 From: Gunasekar-K Date: Tue, 16 Apr 2019 16:45:56 +0530 Subject: [PATCH 1/5] maven changes --- .circleci/config.yml | 12 +----------- 1 file changed, 1 insertion(+), 11 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index b7aa2ae..b10fef9 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -32,15 +32,6 @@ jobs: <<: *java_env steps: - checkout - - run: - name: Configuring maven - command: | - MVNSERVERSETTING='\n tcrepo \n ${env.MVNUSERNAME} \n ${env.MVNPASSWD} \n ' - C=$(echo $MVNSERVERSETTING | sed 's/\//\\\//g') - sudo sed -i.bak "/<\/servers>/ s/.*/${C}\n&/" /opt/apache-maven/conf/settings.xml - MVNSERVERSETTING='\n tcreposnap \n ${env.MVNUSERNAME} \n ${env.MVNPASSWD} \n ' - C=$(echo $MVNSERVERSETTING | sed 's/\//\\\//g') - sudo sed -i.bak "/<\/servers>/ s/.*/${C}\n&/" /opt/apache-maven/conf/settings.xml - setup_remote_docker - restore_cache: key: tc-elasticsearch-feeder-service-{{ checksum "~/project/pom.xml" }} @@ -48,8 +39,7 @@ jobs: - save_cache: paths: - ~/.m2 - key: tc-elasticsearch-feeder-service-{{ checksum "~/project/pom.xml" }} - + key: tc-elasticsearch-feeder-service-{{ checksum "~/project/pom.xml" }} - run: mvn clean compile package - persist_to_workspace: root: . From d077f65c4d7d31e41815455122423123e57f82a4 Mon Sep 17 00:00:00 2001 From: Gunasekar-K Date: Fri, 19 Apr 2019 08:47:08 +0530 Subject: [PATCH 2/5] STS integration --- .circleci/config.yml | 27 ++++++++++++++++++++++++--- .deploy/buildimage.sh | 23 +++++++++++++++++++++++ 2 files changed, 47 insertions(+), 3 deletions(-) create mode 100755 .deploy/buildimage.sh diff --git a/.circleci/config.yml b/.circleci/config.yml index b10fef9..c3403ff 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -25,7 +25,23 @@ deploy_steps: &deploy_steps at: . - run: *install_awscli - setup_remote_docker - - run: .deploy/ecs_deploy.sh $DEPLOY_ENV + - run: + name: "configuring aws environment" + command: | + ./awsconfiguration.sh $DEPLOY_ENV + - run: + name: "Building Docker image for deployment" + command: | + source awsenvconf + .deploy/buildimage.sh $DEPLOY_ENV +# - run: .deploy/ecs_deploy.sh $DEPLOY_ENV + - deploy: + name: Running MasterScript. + command: | + source awsenvconf + ./buildenv.sh -e $DEPLOY_ENV -b $LOGICAL_ENV-tc-elasticsearch-feeder-deployvar + source buildenvvar + ./master_deploy.sh -d ECS -e $DEPLOY_ENV -t latest -s $LOGICAL_ENV-tc-elasticsearch-feeder-appvar -i elasticsearchfeeder jobs: build: @@ -50,18 +66,21 @@ jobs: <<: *python_env environment: DEPLOY_ENV: "PROD" + LOGICAL_ENV: "PROD" steps: *deploy_steps deploy_dev: <<: *python_env environment: DEPLOY_ENV: "DEV" + LOGICAL_ENV: "DEV" steps: *deploy_steps deploy_test: <<: *python_env environment: - DEPLOY_ENV: "TEST" + DEPLOY_ENV: "DEV" + LOGICAL_ENV: "TEST" steps: *deploy_steps @@ -85,6 +104,8 @@ workflows: - deploy_test: filters: branches: - only: dev + only: + - dev + - dev-sts requires: - build diff --git a/.deploy/buildimage.sh b/.deploy/buildimage.sh new file mode 100755 index 0000000..ddd0549 --- /dev/null +++ b/.deploy/buildimage.sh @@ -0,0 +1,23 @@ +#!/bin/bash + +# fail if any occurs +set -e + +ENV=$1 +# Define script variables +DEPLOY_DIR="$( cd "$( dirname "$0" )" && pwd )" +WORKSPACE=$PWD +cd $DEPLOY_DIR/docker +echo "Copying deployment files to docker folder" +cp $WORKSPACE/target/elasticsearch-feeder-service*.jar elasticsearch-feeder-service.jar +cp $WORKSPACE/src/main/resources/elasticsearch-feeder-service.yaml elasticsearch-feeder-service.yaml +cp $WORKSPACE/.deploy/ecs_task_template.json ecs_task_template.json + +echo "Logging into docker" +echo "############################" +#docker login $DOCKER_EMAIL -u $DOCKER_USER -p $DOCKER_PASSWD +#docker login -u $DOCKER_USER -p $DOCKER_PASSWD +aws s3 cp "s3://appirio-platform-$ENV/services/common/dockercfg" ~/.dockercfg +#TAG=$AWS_ACCOUNT_ID.dkr.ecr.$AWS_REGION.amazonaws.com/$AWS_REPOSITORY:$CIRCLE_SHA1 +TAG="elasticsearchfeeder:latest" +docker build -t $TAG . From 847935828e5cc653c2f726cae2781df5aebda496 Mon Sep 17 00:00:00 2001 From: Gunasekar-K Date: Fri, 19 Apr 2019 09:15:19 +0530 Subject: [PATCH 3/5] STS integration --- .circleci/config.yml | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/.circleci/config.yml b/.circleci/config.yml index c3403ff..459b9cb 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -18,12 +18,20 @@ install_awscli: &install_awscli aws --version eb --version +install_deploysuite: &install_deploysuite + name: Installation of install_deploysuite. + command: | + git clone --branch v1.3 https://github.com/topcoder-platform/tc-deploy-scripts ../buildscript + cp ./../buildscript/master_deploy.sh . + cp ./../buildscript/buildenv.sh . + cp ./../buildscript/awsconfiguration.sh . # Instructions of deployment deploy_steps: &deploy_steps - checkout - attach_workspace: at: . - run: *install_awscli + - run: *install_deploysuite - setup_remote_docker - run: name: "configuring aws environment" @@ -90,18 +98,21 @@ workflows: jobs: - build - deploy_dev: + context : org-global filters: branches: only: [dummy-dev] requires: - build - deploy_prod: + context : org-global filters: branches: only: master requires: - build - deploy_test: + context : org-global filters: branches: only: From 6c84048850ba04cba883b6e82e1196f088a77a9a Mon Sep 17 00:00:00 2001 From: Gunasekar-K Date: Fri, 19 Apr 2019 09:35:40 +0530 Subject: [PATCH 4/5] STS integration --- .deploy/buildimage.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/.deploy/buildimage.sh b/.deploy/buildimage.sh index ddd0549..789cb38 100755 --- a/.deploy/buildimage.sh +++ b/.deploy/buildimage.sh @@ -4,6 +4,7 @@ set -e ENV=$1 +ENV=`echo "$ENV" | tr '[:upper:]' '[:lower:]'` # Define script variables DEPLOY_DIR="$( cd "$( dirname "$0" )" && pwd )" WORKSPACE=$PWD From ca55b9b7e7db33dbfe53736efe2d830e41c3b79c Mon Sep 17 00:00:00 2001 From: Gunasekar-K Date: Fri, 19 Apr 2019 09:40:32 +0530 Subject: [PATCH 5/5] STS integration FARGATE issue --- .circleci/config.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 459b9cb..d6cb7f1 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -49,7 +49,7 @@ deploy_steps: &deploy_steps source awsenvconf ./buildenv.sh -e $DEPLOY_ENV -b $LOGICAL_ENV-tc-elasticsearch-feeder-deployvar source buildenvvar - ./master_deploy.sh -d ECS -e $DEPLOY_ENV -t latest -s $LOGICAL_ENV-tc-elasticsearch-feeder-appvar -i elasticsearchfeeder + ./master_deploy.sh -d ECS -e $DEPLOY_ENV -t latest -s $LOGICAL_ENV-tc-elasticsearch-feeder-appvar -i elasticsearchfeeder -p FARGATE jobs: build: