Skip to content
This repository was archived by the owner on Oct 30, 2023. It is now read-only.

Commit 38a9634

Browse files
8001780017
authored
Merge pull request #7 from FlowzPlatform/develop
Develop
2 parents 55eac18 + 044debc commit 38a9634

File tree

4 files changed

+81
-16
lines changed

4 files changed

+81
-16
lines changed

‎.travis.yml

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@ branches:
99
only:
1010
- master
1111
- develop
12+
- staging
1213
- QA
1314

1415
jobs:
@@ -27,6 +28,14 @@ jobs:
2728
docker images;
2829
docker tag worker_uploader_import_progress:dev $DOCKER_USERNAME/worker_uploader_import_progress:dev;
2930
docker push $DOCKER_USERNAME/worker_uploader_import_progress:dev;
31+
elif [ ${TRAVIS_BRANCH} = "staging" ]; then
32+
docker login -u="$DOCKER_USERNAME" -p="$DOCKER_PASSWORD";
33+
docker build -t worker_uploader_import_progress:$TRAVIS_BRANCH-$TRAVIS_BUILD_NUMBER .;
34+
docker tag worker_uploader_import_progress:$TRAVIS_BRANCH-$TRAVIS_BUILD_NUMBER $DOCKER_USERNAME/worker_uploader_import_progress:$TRAVIS_BRANCH-$TRAVIS_BUILD_NUMBER;
35+
docker tag worker_uploader_import_progress:$TRAVIS_BRANCH-$TRAVIS_BUILD_NUMBER $DOCKER_USERNAME/worker_uploader_import_progress:staging;
36+
docker images;
37+
docker push $DOCKER_USERNAME/worker_uploader_import_progress:$TRAVIS_BRANCH-$TRAVIS_BUILD_NUMBER;
38+
docker push $DOCKER_USERNAME/worker_uploader_import_progress:staging;
3039
else
3140
docker login -u="$DOCKER_USERNAME" -p="$DOCKER_PASSWORD";
3241
docker build -t worker_uploader_import_progress:qa .;

‎finish.sh

Lines changed: 27 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -2,42 +2,61 @@ if [ "$TRAVIS_BRANCH" = "master" ]
22
then
33
{
44
echo "call $TRAVIS_BRANCH branch"
5-
ENV_ID=`curl -u ""$RANCHER_USER":"$RANCHER_PASS"" -X GET -H 'Accept: application/json' -H 'Content-Type: application/json' "http://rancher.flowz.com:8080/v2-beta/projects?name=Production" | jq '.data[].id' | tr -d '"'`
5+
ENV_ID=`curl -u ""$RANCHER_ACCESSKEY_MASTER":"$RANCHER_SECRETKEY_MASTER"" -X GET -H 'Accept: application/json' -H 'Content-Type: application/json' "$RANCHER_URL_MASTER/v2-beta/projects?name=Production" | jq '.data[].id' | tr -d '"'`
66
echo $ENV_ID
7+
RANCHER_ACCESSKEY="$RANCHER_ACCESSKEY_MASTER";
8+
RANCHER_SECRETKEY="$RANCHER_SECRETKEY_MASTER";
9+
RANCHER_URL="$RANCHER_URL_MASTER";
710
}
811
elif [ "$TRAVIS_BRANCH" = "develop" ]
912
then
1013
{
1114
echo "call $TRAVIS_BRANCH branch"
12-
ENV_ID=`curl -u ""$RANCHER_USER":"$RANCHER_PASS"" -X GET -H 'Accept: application/json' -H 'Content-Type: application/json' "http://rancher.flowz.com:8080/v2-beta/projects?name=Develop" | jq '.data[].id' | tr -d '"'`
15+
ENV_ID=`curl -u ""$RANCHER_ACCESSKEY_DEVELOP":"$RANCHER_SECRETKEY_DEVELOP"" -X GET -H 'Accept: application/json' -H 'Content-Type: application/json' "$RANCHER_URL_DEVELOP/v2-beta/projects?name=Develop" | jq '.data[].id' | tr -d '"'`
1316
echo $ENV_ID
17+
RANCHER_ACCESSKEY="$RANCHER_ACCESSKEY_DEVELOP";
18+
RANCHER_SECRETKEY="$RANCHER_SECRETKEY_DEVELOP";
19+
RANCHER_URL="$RANCHER_URL_DEVELOP";
1420
}
21+
elif [ "$TRAVIS_BRANCH" = "staging" ]
22+
then
23+
{
24+
echo "call $TRAVIS_BRANCH branch"
25+
ENV_ID=`curl -u ""$RANCHER_ACCESSKEY_STAGING":"$RANCHER_SECRETKEY_STAGING"" -X GET -H 'Accept: application/json' -H 'Content-Type: application/json' "$RANCHER_URL_STAGING/v2-beta/projects?name=Staging" | jq '.data[].id' | tr -d '"'`
26+
echo $ENV_ID
27+
RANCHER_ACCESSKEY="$RANCHER_ACCESSKEY_STAGING";
28+
RANCHER_SECRETKEY="$RANCHER_SECRETKEY_STAGING";
29+
RANCHER_URL="$RANCHER_URL_STAGING";
30+
}
1531
else
1632
{
1733
echo "call $TRAVIS_BRANCH branch"
18-
ENV_ID=`curl -u ""$RANCHER_USER":"$RANCHER_PASS"" -X GET -H 'Accept: application/json' -H 'Content-Type: application/json' "http://rancher.flowz.com:8080/v2-beta/projects?name=QA" | jq '.data[].id' | tr -d '"'`
34+
ENV_ID=`curl -u ""$RANCHER_ACCESSKEY_QA":"$RANCHER_SECRETKEY_QA"" -X GET -H 'Accept: application/json' -H 'Content-Type: application/json' "$RANCHER_URL_QA/v2-beta/projects?name=QA" | jq '.data[].id' | tr -d '"'`
1935
echo $ENV_ID
36+
RANCHER_ACCESSKEY="$RANCHER_ACCESSKEY_QA";
37+
RANCHER_SECRETKEY="$RANCHER_SECRETKEY_QA";
38+
RANCHER_URL="$RANCHER_URL_QA";
2039
}
2140
fi
2241

23-
SERVICE_ID=`curl -u ""$RANCHER_USER":"$RANCHER_PASS"" -X GET -H 'Accept: application/json' -H 'Content-Type: application/json' "http://rancher.flowz.com:8080/v2-beta/projects/$ENV_ID/services?name=worker-uploader-progress" | jq '.data[].id' | tr -d '"'`
42+
SERVICE_ID=`curl -u ""$RANCHER_ACCESSKEY":"$RANCHER_SECRETKEY"" -X GET -H 'Accept: application/json' -H 'Content-Type: application/json' "$RANCHER_URL/v2-beta/projects/$ENV_ID/services?name=worker-uploader-progress" | jq '.data[].id' | tr -d '"'`
2443
echo $SERVICE_ID
2544

2645
echo "waiting for service to upgrade "
2746
while true; do
2847

29-
case `curl -u ""$RANCHER_USER":"$RANCHER_PASS"" \
48+
case `curl -u ""$RANCHER_ACCESSKEY":"$RANCHER_SECRETKEY"" \
3049
-X GET \
3150
-H 'Accept: application/json' \
3251
-H 'Content-Type: application/json' \
33-
"http://rancher.flowz.com:8080/v2-beta/projects/$ENV_ID/services/$SERVICE_ID/" | jq '.state'` in
52+
"$RANCHER_URL/v2-beta/projects/$ENV_ID/services/$SERVICE_ID/" | jq '.state'` in
3453
"\"upgraded\"" )
3554
echo "completing service upgrade"
36-
curl -u ""$RANCHER_USER":"$RANCHER_PASS"" \
55+
curl -u ""$RANCHER_ACCESSKEY":"$RANCHER_SECRETKEY"" \
3756
-X POST \
3857
-H 'Accept: application/json' \
3958
-H 'Content-Type: application/json' \
40-
"http://rancher.flowz.com:8080/v2-beta/projects/$ENV_ID/services/$SERVICE_ID?action=finishupgrade"
59+
"$RANCHER_URL/v2-beta/projects/$ENV_ID/services/$SERVICE_ID?action=finishupgrade"
4160
break ;;
4261
"\"upgrading\"" )
4362
echo "still upgrading"

‎upgrade.sh

Lines changed: 44 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -3,37 +3,74 @@ if [ "$TRAVIS_BRANCH" = "master" ]
33
then
44
{
55
echo "call $TRAVIS_BRANCH branch"
6-
ENV_ID=`curl -u ""$RANCHER_USER":"$RANCHER_PASS"" -X GET -H 'Accept: application/json' -H 'Content-Type: application/json' "http://rancher.flowz.com:8080/v2-beta/projects?name=Production" | jq '.data[].id' | tr -d '"'`
6+
ENV_ID=`curl -u ""$RANCHER_ACCESSKEY_MASTER":"$RANCHER_SECRETKEY_MASTER"" -X GET -H 'Accept: application/json' -H 'Content-Type: application/json' "$RANCHER_URL_MASTER/v2-beta/projects?name=Production" | jq '.data[].id' | tr -d '"'`
77
echo $ENV_ID
88
USERNAME="$DOCKER_USERNAME_FLOWZ";
99
TAG="latest";
10+
MONGO_URL="$MONGO_URL_MASTER";
11+
ESHOST="$ESHOST_MASTER";
12+
ESPORT="$ESPORT_MASTER";
13+
ESAUTH="$ESAUTH_MASTER";
14+
RANCHER_ACCESSKEY="$RANCHER_ACCESSKEY_MASTER";
15+
RANCHER_SECRETKEY="$RANCHER_SECRETKEY_MASTER";
16+
RANCHER_URL="$RANCHER_URL_MASTER";
1017
}
1118
elif [ "$TRAVIS_BRANCH" = "develop" ]
1219
then
1320
{
1421
echo "call $TRAVIS_BRANCH branch"
15-
ENV_ID=`curl -u ""$RANCHER_USER":"$RANCHER_PASS"" -X GET -H 'Accept: application/json' -H 'Content-Type: application/json' "http://rancher.flowz.com:8080/v2-beta/projects?name=Develop" | jq '.data[].id' | tr -d '"'`
22+
ENV_ID=`curl -u ""$RANCHER_ACCESSKEY_DEVELOP":"$RANCHER_SECRETKEY_DEVELOP"" -X GET -H 'Accept: application/json' -H 'Content-Type: application/json' "$RANCHER_URL_DEVELOP/v2-beta/projects?name=Develop" | jq '.data[].id' | tr -d '"'`
1623
echo $ENV_ID
1724
USERNAME="$DOCKER_USERNAME";
1825
TAG="dev";
26+
MONGO_URL="$MONGO_URL_DEVELOP";
27+
ESHOST="$ESHOST_DEVELOP";
28+
ESPORT="$ESPORT_DEVELOP";
29+
ESAUTH="$ESAUTH_DEVELOP";
30+
RANCHER_ACCESSKEY="$RANCHER_ACCESSKEY_DEVELOP";
31+
RANCHER_SECRETKEY="$RANCHER_SECRETKEY_DEVELOP";
32+
RANCHER_URL="$RANCHER_URL_DEVELOP";
1933
}
34+
elif [ "$TRAVIS_BRANCH" = "staging" ]
35+
then
36+
{
37+
echo "call $TRAVIS_BRANCH branch"
38+
ENV_ID=`curl -u ""$RANCHER_ACCESSKEY_STAGING":"$RANCHER_SECRETKEY_STAGING"" -X GET -H 'Accept: application/json' -H 'Content-Type: application/json' "$RANCHER_URL_STAGING/v2-beta/projects?name=Staging" | jq '.data[].id' | tr -d '"'`
39+
echo $ENV_ID
40+
USERNAME="$DOCKER_USERNAME";
41+
TAG="staging";
42+
MONGO_URL="$MONGO_URL_STAGING";
43+
ESHOST="$ESHOST_STAGING";
44+
ESPORT="$ESPORT_STAGING";
45+
ESAUTH="$ESAUTH_STAGING";
46+
RANCHER_ACCESSKEY="$RANCHER_ACCESSKEY_STAGING";
47+
RANCHER_SECRETKEY="$RANCHER_SECRETKEY_STAGING";
48+
RANCHER_URL="$RANCHER_URL_STAGING";
49+
}
2050
else
2151
{
2252
echo "call $TRAVIS_BRANCH branch"
23-
ENV_ID=`curl -u ""$RANCHER_USER":"$RANCHER_PASS"" -X GET -H 'Accept: application/json' -H 'Content-Type: application/json' "http://rancher.flowz.com:8080/v2-beta/projects?name=QA" | jq '.data[].id' | tr -d '"'`
53+
ENV_ID=`curl -u ""$RANCHER_ACCESSKEY_QA":"$RANCHER_SECRETKEY_QA"" -X GET -H 'Accept: application/json' -H 'Content-Type: application/json' "$RANCHER_URL_QA/v2-beta/projects?name=QA" | jq '.data[].id' | tr -d '"'`
2454
echo $ENV_ID
2555
USERNAME="$DOCKER_USERNAME";
2656
TAG="qa";
57+
MONGO_URL="$MONGO_URL_QA";
58+
ESHOST="$ESHOST_QA";
59+
ESPORT="$ESPORT_QA";
60+
ESAUTH="$ESAUTH_QA";
61+
RANCHER_ACCESSKEY="$RANCHER_ACCESSKEY_QA";
62+
RANCHER_SECRETKEY="$RANCHER_SECRETKEY_QA";
63+
RANCHER_URL="$RANCHER_URL_QA";
2764
}
2865
fi
2966

30-
SERVICE_ID=`curl -u ""$RANCHER_USER":"$RANCHER_PASS"" -X GET -H 'Accept: application/json' -H 'Content-Type: application/json' "http://rancher.flowz.com:8080/v2-beta/projects/$ENV_ID/services?name=worker-uploader-progress" | jq '.data[].id' | tr -d '"'`
67+
SERVICE_ID=`curl -u ""$RANCHER_ACCESSKEY":"$RANCHER_SECRETKEY"" -X GET -H 'Accept: application/json' -H 'Content-Type: application/json' "$RANCHER_URL/v2-beta/projects/$ENV_ID/services?name=worker-uploader-progress" | jq '.data[].id' | tr -d '"'`
3168
echo $SERVICE_ID
3269

33-
curl -u ""$RANCHER_USER":"$RANCHER_PASS"" \
70+
curl -u ""$RANCHER_ACCESSKEY":"$RANCHER_SECRETKEY"" \
3471
-X POST \
3572
-H 'Accept: application/json' \
3673
-H 'Content-Type: application/json' \
3774
-d '{
38-
"inServiceStrategy":{"launchConfig": {"imageUuid":"docker:'$USERNAME'/worker_uploader_import_progress:'$TAG'","kind": "container","labels":{"io.rancher.container.pull_image": "always","io.rancher.scheduler.affinity:host_label": "machine=cluster-flowz"},"environment": {"rdbHost": "'"$rdbHost"'","rdbPort": "'"$rdbPort"'","mongoURL":"'"$mongoURL"'","esHost":"'"$esHost"'","esPort":"'"$esPort"'","esAuth":"'"$esAuth"'"}}},"toServiceStrategy":null}' \
39-
http://rancher.flowz.com:8080/v2-beta/projects/$ENV_ID/services/$SERVICE_ID?action=upgrade
75+
"inServiceStrategy":{"launchConfig": {"imageUuid":"docker:'$USERNAME'/worker_uploader_import_progress:'$TAG'","kind": "container","labels":{"io.rancher.container.pull_image": "always","io.rancher.scheduler.affinity:host_label": "machine=cluster-flowz"},"environment": {"rdbHost": "'"$rdbHost"'","rdbPort": "'"$rdbPort"'","mongoURL":"'"$MONGO_URL"'","esHost":"'"$ESHOST"'","esPort":"'"$ESPORT"'","esAuth":"'"$ESAUTH"'"}}},"toServiceStrategy":null}' \
76+
$RANCHER_URL/v2-beta/projects/$ENV_ID/services/$SERVICE_ID?action=upgrade

‎uploader.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -196,7 +196,7 @@ async function findVirtualShopData (rconnObj, rdb, rtable, username, userObj) {
196196
return new Promise(async (resolve, reject) => {
197197
console.log('================findVal=========', username)
198198
rethink.db(rdb).table(rtable)
199-
.filter({'esUser': username})
199+
.filter({'esUser': username,'userType': 'supplier'})
200200
.run(rconnObj, function (err, cursor) {
201201
if (err) {
202202
reject(err)

0 commit comments

Comments
 (0)