Skip to content
This repository was archived by the owner on Jan 23, 2025. It is now read-only.

Commit 67736e2

Browse files
Gunasekar-KGunasekar-K
authored
Merge pull request #485 from appirio-tech/hotfix-sts
STS integration
2 parents 575cc97 + 0b148ac commit 67736e2

File tree

3 files changed

+98
-184
lines changed

3 files changed

+98
-184
lines changed

‎.circleci/config.yml

Lines changed: 80 additions & 165 deletions
Original file line numberDiff line numberDiff line change
@@ -1,188 +1,103 @@
11
version: 2
2+
defaults: &defaults
3+
docker:
4+
- image: openjdk:7
25

6+
install_dependency: &install_dependency
7+
name: Installation of build dependencies.
8+
command: |
9+
sed -i '/jessie-updates/d' /etc/apt/sources.list
10+
apt update
11+
apt install -y openssl ant git zip jq
12+
mkdir ~/awscli
13+
cd ~/awscli
14+
curl "https://s3.amazonaws.com/aws-cli/awscli-bundle.zip" -o "awscli-bundle.zip"
15+
unzip awscli-bundle.zip
16+
./awscli-bundle/install -i /usr/local/aws -b /usr/local/bin/aws
17+
cd /usr/share/ant/lib
18+
wget https://repo1.maven.org/maven2/org/codehaus/groovy/groovy-all/1.7.8/groovy-all-1.7.8.jar
19+
wget https://repo1.maven.org/maven2/ant-contrib/ant-contrib/1.0b3/ant-contrib-1.0b3.jar
20+
cd ~
21+
wget http://downloads.sourceforge.net/project/jboss/JBoss/JBoss-4.2.3.GA/jboss-4.2.3.GA-jdk6.zip
22+
unzip jboss-4.2.3.GA-jdk6.zip
23+
cd project
24+
install_deploysuite: &install_deploysuite
25+
name: Installation of install_deploysuite.
26+
command: |
27+
git clone --branch v1.3 https://github.com/topcoder-platform/tc-deploy-scripts ../buildscript
28+
cp ./../buildscript/master_deploy.sh .
29+
cp ./../buildscript/buildenv.sh .
30+
cp ./../buildscript/awsconfiguration.sh .
31+
build_steps: &build_steps
32+
# Initialization.
33+
- run: *install_dependency
34+
- checkout
35+
- run: *install_deploysuite
36+
- run:
37+
name: "AWS Configuration"
38+
command: |
39+
./awsconfiguration.sh $BUILD_ENV
40+
source awsenvconf
41+
- run:
42+
name: Installation of build dependencies.
43+
command: |
44+
source awsenvconf
45+
./buildproperties.sh -e $BUILD_ENV -k directapp
46+
ant package-direct package-static-direct
47+
- store_artifacts:
48+
path: ./direct.jar
49+
destination: direct.jar
50+
- store_artifacts:
51+
path: ./direct-static-all.jar
52+
destination: direct-static-all.jar
53+
- run:
54+
name: Build Pacakge
55+
command: ./build-package.sh $BUILD_ENV
56+
- run:
57+
name: "Deployment direct app and direct web"
58+
command: |
59+
#cp ./../buildscript/master_deploy.sh .
60+
source awsenvconf
61+
cp -f buildvar-app.conf buildvar.conf
62+
./deploy.sh $BUILD_ENV $VER
63+
echo "Deployment direct web"
64+
cp -f buildvar-web.conf buildvar.conf
65+
./deploy.sh $BUILD_ENV $VER
66+
#cp ./../buildscript/master_deploy.sh .
367
jobs:
468
# Build & Deploy against development backend
569
"build-dev":
6-
docker:
7-
- image: openjdk:7
8-
steps:
9-
# Initialization.
10-
- run:
11-
name: Installation of build dependencies.
12-
command: |
13-
apt update
14-
apt install -y openssl ant git zip jq
15-
mkdir ~/awscli
16-
cd ~/awscli
17-
curl "https://s3.amazonaws.com/aws-cli/awscli-bundle.zip" -o "awscli-bundle.zip"
18-
unzip awscli-bundle.zip
19-
./awscli-bundle/install -i /usr/local/aws -b /usr/local/bin/aws
20-
cd /usr/share/ant/lib
21-
wget https://repo1.maven.org/maven2/org/codehaus/groovy/groovy-all/1.7.8/groovy-all-1.7.8.jar
22-
wget https://repo1.maven.org/maven2/ant-contrib/ant-contrib/1.0b3/ant-contrib-1.0b3.jar
23-
cd ~
24-
wget http://downloads.sourceforge.net/project/jboss/JBoss/JBoss-4.2.3.GA/jboss-4.2.3.GA-jdk6.zip
25-
unzip jboss-4.2.3.GA-jdk6.zip
26-
cd project
27-
- checkout
28-
- run:
29-
name: Installation of build dependencies.
30-
command: |
31-
javac -version
32-
ant -version
33-
aws --version
34-
./buildproperties.sh -e DEV -k directapp
35-
ant package-direct package-static-direct
36-
- store_artifacts:
37-
path: ./direct.jar
38-
destination: direct.jar
39-
- store_artifacts:
40-
path: ./direct-static-all.jar
41-
destination: direct-static-all.jar
42-
- run:
43-
name: Build Pacakge
44-
command: ./build-package.sh DEV
45-
- run:
46-
name: Deployment direct app.
47-
command: |
48-
#cp ./../buildscript/master_deploy.sh .
49-
cp -f buildvar-app.conf buildvar.conf
50-
./deploy.sh DEV $VER
51-
- run:
52-
name: Deployment direct web
53-
command: |
54-
cp -f buildvar-web.conf buildvar.conf
55-
./deploy.sh DEV $VER
56-
#cp ./../buildscript/master_deploy.sh .
70+
<<: *defaults
71+
environment:
72+
BUILD_ENV: "DEV"
73+
steps: *build_steps
5774
"build-qa":
58-
docker:
59-
- image: openjdk:7
60-
steps:
61-
# Initialization.
62-
- run:
63-
name: Installation of build dependencies.
64-
command: |
65-
apt update
66-
apt install -y openssl ant git zip jq
67-
mkdir ~/awscli
68-
cd ~/awscli
69-
curl "https://s3.amazonaws.com/aws-cli/awscli-bundle.zip" -o "awscli-bundle.zip"
70-
unzip awscli-bundle.zip
71-
./awscli-bundle/install -i /usr/local/aws -b /usr/local/bin/aws
72-
cd /usr/share/ant/lib
73-
wget https://repo1.maven.org/maven2/org/codehaus/groovy/groovy-all/1.7.8/groovy-all-1.7.8.jar
74-
wget https://repo1.maven.org/maven2/ant-contrib/ant-contrib/1.0b3/ant-contrib-1.0b3.jar
75-
cd ~
76-
wget http://downloads.sourceforge.net/project/jboss/JBoss/JBoss-4.2.3.GA/jboss-4.2.3.GA-jdk6.zip
77-
unzip jboss-4.2.3.GA-jdk6.zip
78-
cd project
79-
- run:
80-
name: checking out build repo
81-
command: |
82-
git clone --branch master https://github.com/topcoder-platform/tc-deploy-scripts ../buildscript
83-
#git clone --branch master git@github.com:appirio-tech/ops.git ../direct-config-update
84-
#git clone --branch master https://$GITUSER:$GITPASSWD@github.com/appirio-tech/ops ../direct-config-update
85-
- checkout
86-
- run:
87-
name: copying configuration file
88-
command: |
89-
cp ./../buildscript/direct/conf/qa/token.properties.enc .
90-
openssl enc -aes-256-cbc -d -in token.properties.enc -out token.properties -k $SECPASSWD
91-
- run:
92-
name: Installation of build dependencies.
93-
command: |
94-
javac -version
95-
ant -version
96-
aws --version
97-
ant package-direct package-static-direct
98-
- store_artifacts:
99-
path: ./direct.jar
100-
destination: direct.jar
101-
- store_artifacts:
102-
path: ./direct-static-all.jar
103-
destination: direct-static-all.jar
104-
- run:
105-
name: Build Pacakge
106-
command: ./build-package.sh QA
107-
- run:
108-
name: Deployment direct app.
109-
command: |
110-
#cp ./../buildscript/master_deploy.sh .
111-
cp -f buildvar-app.conf buildvar.conf
112-
./deploy.sh QA $VER
113-
- run:
114-
name: Deployment direct web
115-
command: |
116-
cp -f buildvar-web.conf buildvar.conf
117-
./deploy.sh QA $VER
118-
#cp ./../buildscript/master_deploy.sh .
75+
<<: *defaults
76+
environment:
77+
BUILD_ENV: "QA"
78+
steps: *build_steps
11979
"build-prod":
120-
docker:
121-
- image: openjdk:7
122-
steps:
123-
# Initialization.
124-
- run:
125-
name: Installation of build dependencies.
126-
command: |
127-
apt update
128-
apt install -y openssl ant git zip jq
129-
mkdir ~/awscli
130-
cd ~/awscli
131-
curl "https://s3.amazonaws.com/aws-cli/awscli-bundle.zip" -o "awscli-bundle.zip"
132-
unzip awscli-bundle.zip
133-
./awscli-bundle/install -i /usr/local/aws -b /usr/local/bin/aws
134-
cd /usr/share/ant/lib
135-
wget https://repo1.maven.org/maven2/org/codehaus/groovy/groovy-all/1.7.8/groovy-all-1.7.8.jar
136-
wget https://repo1.maven.org/maven2/ant-contrib/ant-contrib/1.0b3/ant-contrib-1.0b3.jar
137-
cd ~
138-
wget http://downloads.sourceforge.net/project/jboss/JBoss/JBoss-4.2.3.GA/jboss-4.2.3.GA-jdk6.zip
139-
unzip jboss-4.2.3.GA-jdk6.zip
140-
cd project
141-
- checkout
142-
- run:
143-
name: Installation of build dependencies.
144-
command: |
145-
javac -version
146-
ant -version
147-
aws --version
148-
./buildproperties.sh -e PROD -k directapp
149-
ant package-direct package-static-direct
150-
- store_artifacts:
151-
path: ./direct.jar
152-
destination: direct.jar
153-
- store_artifacts:
154-
path: ./direct-static-all.jar
155-
destination: direct-static-all.jar
156-
- run:
157-
name: Build Pacakge
158-
command: ./build-package.sh PROD
159-
- run:
160-
name: Deployment direct app.
161-
command: |
162-
#cp ./../buildscript/master_deploy.sh .
163-
cp -f buildvar-app.conf buildvar.conf
164-
./deploy.sh PROD $VER
165-
- run:
166-
name: Deployment direct web
167-
command: |
168-
cp -f buildvar-web.conf buildvar.conf
169-
./deploy.sh PROD $VER
170-
#cp ./../buildscript/master_deploy.sh .
80+
<<: *defaults
81+
environment:
82+
BUILD_ENV: "PROD"
83+
steps: *build_steps
17184

17285
workflows:
17386
version: 2
17487
build:
17588
jobs:
17689
- build-dev:
90+
context : org-global
17791
filters:
17892
branches:
179-
only: [dev, dev-circleci]
93+
only: [dev, dev-sts]
18094
- build-qa:
95+
context : org-global
18196
filters:
18297
branches:
18398
only: qa
18499
- build-prod:
100+
context : org-global
185101
filters:
186102
branches:
187103
only: master
188-

‎buildproperties.sh

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -84,9 +84,9 @@ do
8484
esac
8585
done
8686

87-
AWS_ACCESS_KEY_ID=$(eval "echo \$${ENV}_AWS_ACCESS_KEY_ID")
88-
AWS_SECRET_ACCESS_KEY=$(eval "echo \$${ENV}_AWS_SECRET_ACCESS_KEY")
89-
AWS_REGION=$(eval "echo \$${ENV}_AWS_REGION")
87+
#AWS_ACCESS_KEY_ID=$(eval "echo \$${ENV}_AWS_ACCESS_KEY_ID")
88+
#AWS_SECRET_ACCESS_KEY=$(eval "echo \$${ENV}_AWS_SECRET_ACCESS_KEY")
89+
#AWS_REGION=$(eval "echo \$${ENV}_AWS_REGION")
9090
if [ -z $AWS_REGION ];
9191
then
9292
AWS_REGION="us-east-1"
@@ -97,7 +97,8 @@ then
9797
usage
9898
exit 1
9999
else
100-
configure_aws_cli
100+
#configure_aws_cli
101+
log "AWS configured"
101102
fi
102103
ENV_CONFIG=`echo "$ENV" | tr '[:upper:]' '[:lower:]'`
103104
download_buildenvfile

‎deploy.sh

Lines changed: 13 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -24,10 +24,10 @@ source $BUILD_VARIABLE_FILE_NAME
2424
# openssl enc -aes-256-cbc -d -in $SECRET_FILE_NAME.enc -out $SECRET_FILE_NAME -k $SECPASSWD
2525
# source $SECRET_FILE_NAME
2626

27-
AWS_REGION=$(eval "echo \$${ENV}_AWS_REGION")
28-
AWS_ACCESS_KEY_ID=$(eval "echo \$${ENV}_AWS_ACCESS_KEY_ID")
29-
AWS_SECRET_ACCESS_KEY=$(eval "echo \$${ENV}_AWS_SECRET_ACCESS_KEY")
30-
AWS_ACCOUNT_ID=$(eval "echo \$${ENV}_AWS_ACCOUNT_ID")
27+
# AWS_REGION=$(eval "echo \$${ENV}_AWS_REGION")
28+
# AWS_ACCESS_KEY_ID=$(eval "echo \$${ENV}_AWS_ACCESS_KEY_ID")
29+
# AWS_SECRET_ACCESS_KEY=$(eval "echo \$${ENV}_AWS_SECRET_ACCESS_KEY")
30+
# AWS_ACCOUNT_ID=$(eval "echo \$${ENV}_AWS_ACCOUNT_ID")
3131
AWS_CD_APPNAME=$(eval "echo \$${ENV}_AWS_CD_APPNAME")
3232
AWS_CD_DG_NAME=$(eval "echo \$${ENV}_AWS_CD_DG_NAME")
3333
AWS_CD_DG_CONFIGURATION=$(eval "echo \$${ENV}_AWS_CD_DG_CONFIGURATION")
@@ -60,14 +60,14 @@ track_error()
6060
}
6161

6262
#Function for aws login
63-
configure_aws_cli() {
64-
aws --version
65-
aws configure set aws_access_key_id $AWS_ACCESS_KEY_ID
66-
aws configure set aws_secret_access_key $AWS_SECRET_ACCESS_KEY
67-
aws configure set default.region $AWS_REGION
68-
aws configure set default.output json
69-
log "Configured AWS CLI."
70-
}
63+
# configure_aws_cli() {
64+
# aws --version
65+
# aws configure set aws_access_key_id $AWS_ACCESS_KEY_ID
66+
# aws configure set aws_secret_access_key $AWS_SECRET_ACCESS_KEY
67+
# aws configure set default.region $AWS_REGION
68+
# aws configure set default.output json
69+
# log "Configured AWS CLI."
70+
# }
7171

7272

7373
#uploading to S3 bucket
@@ -135,7 +135,7 @@ cd_deploy_status()
135135
fi
136136

137137
}
138-
configure_aws_cli
138+
# configure_aws_cli
139139
upload_cd_pakcage
140140
update_cd_app_revision
141141
if [ "$DEPLOY" = "1" ] ;
@@ -147,5 +147,3 @@ else
147147
fi
148148
cd_deploy
149149
cd_deploy_status
150-
151-

0 commit comments

Comments
 (0)