Skip to content

Commit

Permalink
Merge pull request #178 from malscent/MB-52637-UpdatesForServer712
Browse files Browse the repository at this point in the history
Updates to AWS Deployments for errors
  • Loading branch information
malscent authored Oct 25, 2022
2 parents 7c43ad6 + 8c56e51 commit 3eabc80
Show file tree
Hide file tree
Showing 4 changed files with 8 additions and 8 deletions.
6 changes: 3 additions & 3 deletions .github/workflows/AWSCouchbaseServerAndSyncGatewayBYOL.yml
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ jobs:
- name: Deploy To AWS
timeout-minutes: 20
run: |
bash ${GITHUB_WORKSPACE}/aws/CouchbaseServerAndSyncGateway/deploy.sh cb-sg-mp-byol byol 3 7.0.3 2 2.8.3
bash ${GITHUB_WORKSPACE}/aws/CouchbaseServerAndSyncGateway/deploy.sh cb-sg-mp-byol byol 3 7.1.2 2 2.8.3
env:
AWS_ACCESS_KEY_ID: ${{ secrets.AWS_ACCESS_KEY_ID }}
AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
Expand Down Expand Up @@ -85,7 +85,7 @@ jobs:
- name: Deploy To AWS
timeout-minutes: 20
run: |
bash ${GITHUB_WORKSPACE}/aws/CouchbaseServerAndSyncGateway/deploy.sh cb-sg-mp-byol-no-sg byol 3 7.0.3 0 2.8.3
bash ${GITHUB_WORKSPACE}/aws/CouchbaseServerAndSyncGateway/deploy.sh cb-sg-mp-byol-no-sg byol 3 7.1.2 0 2.8.3
env:
AWS_ACCESS_KEY_ID: ${{ secrets.AWS_ACCESS_KEY_ID }}
AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
Expand Down Expand Up @@ -127,7 +127,7 @@ jobs:
- name: Deploy To AWS
timeout-minutes: 15
run: |
bash ${GITHUB_WORKSPACE}/aws/CouchbaseServerAndSyncGateway/deploy.sh cb-sg-mp-byol-no-cbs byol 0 7.0.3 2 3.0.3
bash ${GITHUB_WORKSPACE}/aws/CouchbaseServerAndSyncGateway/deploy.sh cb-sg-mp-byol-no-cbs byol 0 7.1.2 2 3.0.3
env:
AWS_ACCESS_KEY_ID: ${{ secrets.AWS_ACCESS_KEY_ID }}
AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/AWSCouchbaseServerAndSyncGatewayHourly.yml
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ jobs:
- name: Deploy To AWS
timeout-minutes: 20
run: |
bash ${GITHUB_WORKSPACE}/aws/CouchbaseServerAndSyncGateway/deploy.sh cb-sg-mp-hourly hourly-pricing 3 7.0.3 2 3.0.3
bash ${GITHUB_WORKSPACE}/aws/CouchbaseServerAndSyncGateway/deploy.sh cb-sg-mp-hourly hourly-pricing 3 7.1.2 2 3.0.3
env:
AWS_ACCESS_KEY_ID: ${{ secrets.AWS_ACCESS_KEY_ID }}
AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
Expand Down Expand Up @@ -85,7 +85,7 @@ jobs:
- name: Deploy To AWS
timeout-minutes: 20
run: |
bash ${GITHUB_WORKSPACE}/aws/CouchbaseServerAndSyncGateway/deploy.sh cb-sg-mp-hourly-no-sg hourly-pricing 3 7.0.3 0 2.8.3
bash ${GITHUB_WORKSPACE}/aws/CouchbaseServerAndSyncGateway/deploy.sh cb-sg-mp-hourly-no-sg hourly-pricing 3 7.1.2 0 2.8.3
env:
AWS_ACCESS_KEY_ID: ${{ secrets.AWS_ACCESS_KEY_ID }}
AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
Expand Down Expand Up @@ -127,7 +127,7 @@ jobs:
- name: Deploy To AWS
timeout-minutes: 15
run: |
bash ${GITHUB_WORKSPACE}/aws/CouchbaseServerAndSyncGateway/deploy.sh cb-sg-mp-hourly-no-cbs hourly-pricing 0 7.0.3 2 3.0.3
bash ${GITHUB_WORKSPACE}/aws/CouchbaseServerAndSyncGateway/deploy.sh cb-sg-mp-hourly-no-cbs hourly-pricing 0 7.1.2 2 3.0.3
env:
AWS_ACCESS_KEY_ID: ${{ secrets.AWS_ACCESS_KEY_ID }}
AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
Expand Down
2 changes: 1 addition & 1 deletion aws/CouchbaseServer/deploy.sh
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ SERVER_VERSION=${SERVER_VERSION:-$SERVER_VERSION_DEFAULT}
KEY_NAME=${KEY_NAME:-"couchbase-${REGION}"}
USERNAME=${USERNAME:-"couchbase"}
PASSWORD=${PASSWORD:-"foo123!"}
SERVICES=${SERVICES:-"\"data\,index\,query\""}
SERVICES=${SERVICES:-"\"data,index,query\""}

${SCRIPT_DIR}/makeArchives.sh -m "${SCRIPT_DIR}/mappings.json" \
-o "${SCRIPT_DIR}/../../build/aws/CouchbaseServer/" \
Expand Down
2 changes: 1 addition & 1 deletion aws/CouchbaseServerAndSyncGateway/deploy.sh
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ if [ -z "$REGION" ]; then
REGION="us-east-1"
fi
Username="couchbase"
Password="foo123!"
Password="foobarbaz123!"
#KeyName="couchbase-${REGION}"
KeyName="ja-test-kp"
SSHCIDR="0.0.0.0/0"
Expand Down

0 comments on commit 3eabc80

Please sign in to comment.