Skip to content

Commit eb8c676

Browse files
ChinthakaPrasadChinthakaPrasad
authored
Merge pull request #11716 from hmislk/development
up tp date changes to qa1 from development
2 parents 706620e + d0f3fc9 commit eb8c676

File tree

61 files changed

+2305
-701
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

61 files changed

+2305
-701
lines changed

‎.github/scripts/db_export_import_scheduler.sh

+3-3
Original file line numberDiff line numberDiff line change
@@ -17,9 +17,9 @@ if [[ ! -f "$CONFIG_FILE" ]]; then
1717
exit 1
1818
fi
1919

20-
# Ensure TO_ENV is either QA or COOP_Test
21-
if [[ "$TO_ENV" != "QA" && "$TO_ENV" != "COOP_Test" ]]; then
22-
echo "Error: TO_ENV must be QA or COOP_Test for now."
20+
# Ensure TO_ENV is either QA1 or QA2
21+
if [[ "$TO_ENV" != "QA1" && "$TO_ENV" != "QA2" ]]; then
22+
echo "Error: TO_ENV must be QA1 or QA2 for now."
2323
exit 1
2424
fi
2525

‎.github/scripts/restart_all_servers.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ fi
2929
IFS=',' read -r -a EXCLUDED_ARRAY <<< "$EXCLUDED_SERVERS"
3030

3131
# Define the included servers
32-
INCLUDED_ARRAY=("Development(4.240.39.63)" "QA(4.240.43.211)")
32+
INCLUDED_ARRAY=("Development(4.240.39.63)" "QA(4.240.43.211)" "Shared01(52.172.158.159)" "Shared02(20.204.129.229)" "D01(4.213.180.217)")
3333

3434
# Remove excluded servers from included array
3535
for excluded in "${EXCLUDED_ARRAY[@]}"; do

‎.github/workflows/codeql-analysis.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ jobs:
3838

3939
steps:
4040
- name: Checkout repository
41-
uses: actions/checkout@v3
41+
uses: actions/checkout@v4
4242

4343
# Initializes the CodeQL tools for scanning.
4444
- name: Initialize CodeQL

‎.github/workflows/coop_dev_ci_cd.yml

+4-4
Original file line numberDiff line numberDiff line change
@@ -11,16 +11,16 @@ jobs:
1111

1212
steps:
1313
- name: Checkout Code
14-
uses: actions/checkout@v3
14+
uses: actions/checkout@v4
1515

1616
- name: Set up JDK 11
17-
uses: actions/setup-java@v3
17+
uses: actions/setup-java@v4
1818
with:
1919
distribution: 'temurin'
2020
java-version: '11'
2121

2222
- name: Cache Maven Packages
23-
uses: actions/cache@v3
23+
uses: actions/cache@v4
2424
with:
2525
path: ~/.m2
2626
key: ${{ runner.os }}-maven-${{ hashFiles('**/pom.xml') }}
@@ -55,7 +55,7 @@ jobs:
5555

5656
steps:
5757
- name: Checkout Code
58-
uses: actions/checkout@v3
58+
uses: actions/checkout@v4
5959

6060
- name: Download Build Artifact
6161
uses: actions/download-artifact@v4

‎.github/workflows/coop_prod_ci_cd.yml

+4-4
Original file line numberDiff line numberDiff line change
@@ -11,16 +11,16 @@ jobs:
1111

1212
steps:
1313
- name: Checkout Code
14-
uses: actions/checkout@v3
14+
uses: actions/checkout@v4
1515

1616
- name: Set up JDK 11
17-
uses: actions/setup-java@v3
17+
uses: actions/setup-java@v4
1818
with:
1919
distribution: 'temurin'
2020
java-version: '11'
2121

2222
- name: Cache Maven Packages
23-
uses: actions/cache@v3
23+
uses: actions/cache@v4
2424
with:
2525
path: ~/.m2
2626
key: ${{ runner.os }}-maven-${{ hashFiles('**/pom.xml') }}
@@ -55,7 +55,7 @@ jobs:
5555

5656
steps:
5757
- name: Checkout Code
58-
uses: actions/checkout@v3
58+
uses: actions/checkout@v4
5959

6060
- name: Download Build Artifact
6161
uses: actions/download-artifact@v4

‎.github/workflows/coop_stg_ci_cd.yml

+4-4
Original file line numberDiff line numberDiff line change
@@ -11,16 +11,16 @@ jobs:
1111

1212
steps:
1313
- name: Checkout Code
14-
uses: actions/checkout@v3
14+
uses: actions/checkout@v4
1515

1616
- name: Set up JDK 11
17-
uses: actions/setup-java@v3
17+
uses: actions/setup-java@v4
1818
with:
1919
distribution: 'temurin'
2020
java-version: '11'
2121

2222
- name: Cache Maven Packages
23-
uses: actions/cache@v3
23+
uses: actions/cache@v4
2424
with:
2525
path: ~/.m2
2626
key: ${{ runner.os }}-maven-${{ hashFiles('**/pom.xml') }}
@@ -55,7 +55,7 @@ jobs:
5555

5656
steps:
5757
- name: Checkout Code
58-
uses: actions/checkout@v3
58+
uses: actions/checkout@v4
5959

6060
- name: Download Build Artifact
6161
uses: actions/download-artifact@v4

‎.github/workflows/database_export_import_scheduler.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,8 @@ on:
1919
required: true
2020
type: choice
2121
options:
22-
- QA
23-
- COOP_Test
22+
- QA1
23+
- QA2
2424
date:
2525
description: 'Select Scheduling Date (YYYY-MM-DD)'
2626
required: true

‎.github/workflows/development_pr_validation.yml

+3-3
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ jobs:
1212

1313
steps:
1414
- name: Checkout Code
15-
uses: actions/checkout@v3
15+
uses: actions/checkout@v4
1616

1717
- name: Verify JDBC Data Sources in persistence.xml
1818
run: |
@@ -32,10 +32,10 @@ jobs:
3232

3333
steps:
3434
- name: Checkout Code
35-
uses: actions/checkout@v3
35+
uses: actions/checkout@v4
3636

3737
- name: Set up JDK 11
38-
uses: actions/setup-java@v3
38+
uses: actions/setup-java@v4
3939
with:
4040
distribution: 'temurin'
4141
java-version: '11'

‎.github/workflows/digasiri_prod_ci_cd.yml

+4-4
Original file line numberDiff line numberDiff line change
@@ -11,16 +11,16 @@ jobs:
1111

1212
steps:
1313
- name: Checkout Code
14-
uses: actions/checkout@v3
14+
uses: actions/checkout@v4
1515

1616
- name: Set up JDK 11
17-
uses: actions/setup-java@v3
17+
uses: actions/setup-java@v4
1818
with:
1919
distribution: 'temurin'
2020
java-version: '11'
2121

2222
- name: Cache Maven Packages
23-
uses: actions/cache@v3
23+
uses: actions/cache@v4
2424
with:
2525
path: ~/.m2
2626
key: ${{ runner.os }}-maven-${{ hashFiles('**/pom.xml') }}
@@ -55,7 +55,7 @@ jobs:
5555

5656
steps:
5757
- name: Checkout Code
58-
uses: actions/checkout@v3
58+
uses: actions/checkout@v4
5959

6060
- name: Download Build Artifact
6161
uses: actions/download-artifact@v4

‎.github/workflows/hims_qa1_ci_cd.yml

+4-4
Original file line numberDiff line numberDiff line change
@@ -11,16 +11,16 @@ jobs:
1111

1212
steps:
1313
- name: Checkout Code
14-
uses: actions/checkout@v3
14+
uses: actions/checkout@v4
1515

1616
- name: Set up JDK 11
17-
uses: actions/setup-java@v3
17+
uses: actions/setup-java@v4
1818
with:
1919
distribution: 'temurin'
2020
java-version: '11'
2121

2222
- name: Cache Maven Packages
23-
uses: actions/cache@v3
23+
uses: actions/cache@v4
2424
with:
2525
path: ~/.m2
2626
key: ${{ runner.os }}-maven-${{ hashFiles('**/pom.xml') }}
@@ -55,7 +55,7 @@ jobs:
5555

5656
steps:
5757
- name: Checkout Code
58-
uses: actions/checkout@v3
58+
uses: actions/checkout@v4
5959

6060
- name: Download Build Artifact
6161
uses: actions/download-artifact@v4

‎.github/workflows/hims_qa2_ci_cd.yml

+4-4
Original file line numberDiff line numberDiff line change
@@ -11,16 +11,16 @@ jobs:
1111

1212
steps:
1313
- name: Checkout Code
14-
uses: actions/checkout@v3
14+
uses: actions/checkout@v4
1515

1616
- name: Set up JDK 11
17-
uses: actions/setup-java@v3
17+
uses: actions/setup-java@v4
1818
with:
1919
distribution: 'temurin'
2020
java-version: '11'
2121

2222
- name: Cache Maven Packages
23-
uses: actions/cache@v3
23+
uses: actions/cache@v4
2424
with:
2525
path: ~/.m2
2626
key: ${{ runner.os }}-maven-${{ hashFiles('**/pom.xml') }}
@@ -55,7 +55,7 @@ jobs:
5555

5656
steps:
5757
- name: Checkout Code
58-
uses: actions/checkout@v3
58+
uses: actions/checkout@v4
5959

6060
- name: Download Build Artifact
6161
uses: actions/download-artifact@v4

‎.github/workflows/horizon_prod_ci_cd.yml

+4-4
Original file line numberDiff line numberDiff line change
@@ -11,16 +11,16 @@ jobs:
1111

1212
steps:
1313
- name: Checkout Code
14-
uses: actions/checkout@v3
14+
uses: actions/checkout@v4
1515

1616
- name: Set up JDK 11
17-
uses: actions/setup-java@v3
17+
uses: actions/setup-java@v4
1818
with:
1919
distribution: 'temurin'
2020
java-version: '11'
2121

2222
- name: Cache Maven Packages
23-
uses: actions/cache@v3
23+
uses: actions/cache@v4
2424
with:
2525
path: ~/.m2
2626
key: ${{ runner.os }}-maven-${{ hashFiles('**/pom.xml') }}
@@ -55,7 +55,7 @@ jobs:
5555

5656
steps:
5757
- name: Checkout Code
58-
uses: actions/checkout@v3
58+
uses: actions/checkout@v4
5959

6060
- name: Download Build Artifact
6161
uses: actions/download-artifact@v4

‎.github/workflows/kml_prod_ci_cd.yml

+4-4
Original file line numberDiff line numberDiff line change
@@ -11,16 +11,16 @@ jobs:
1111

1212
steps:
1313
- name: Checkout Code
14-
uses: actions/checkout@v3
14+
uses: actions/checkout@v4
1515

1616
- name: Set up JDK 11
17-
uses: actions/setup-java@v3
17+
uses: actions/setup-java@v4
1818
with:
1919
distribution: 'temurin'
2020
java-version: '11'
2121

2222
- name: Cache Maven Packages
23-
uses: actions/cache@v3
23+
uses: actions/cache@v4
2424
with:
2525
path: ~/.m2
2626
key: ${{ runner.os }}-maven-${{ hashFiles('**/pom.xml') }}
@@ -55,7 +55,7 @@ jobs:
5555

5656
steps:
5757
- name: Checkout Code
58-
uses: actions/checkout@v3
58+
uses: actions/checkout@v4
5959

6060
- name: Download Build Artifact
6161
uses: actions/download-artifact@v4

‎.github/workflows/mp_prod_ci_cd.yml

+4-4
Original file line numberDiff line numberDiff line change
@@ -11,16 +11,16 @@ jobs:
1111

1212
steps:
1313
- name: Checkout Code
14-
uses: actions/checkout@v3
14+
uses: actions/checkout@v4
1515

1616
- name: Set up JDK 11
17-
uses: actions/setup-java@v3
17+
uses: actions/setup-java@v4
1818
with:
1919
distribution: 'temurin'
2020
java-version: '11'
2121

2222
- name: Cache Maven Packages
23-
uses: actions/cache@v3
23+
uses: actions/cache@v4
2424
with:
2525
path: ~/.m2
2626
key: ${{ runner.os }}-maven-${{ hashFiles('**/pom.xml') }}
@@ -55,7 +55,7 @@ jobs:
5555

5656
steps:
5757
- name: Checkout Code
58-
uses: actions/checkout@v3
58+
uses: actions/checkout@v4
5959

6060
- name: Download Build Artifact
6161
uses: actions/download-artifact@v4

‎.github/workflows/production_merge_validation.yml

+4-5
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,10 @@ name: Production Merge Validation
22

33
on:
44
pull_request:
5-
types: [ opened, synchronize, reopened ]
5+
types: [ opened, synchronize, reopened, edited ]
66
branches:
77
- '*-prod'
8-
- '-staging'
9-
- '*-stg'
8+
- 'staging'
109

1110
jobs:
1211
check-branch:
@@ -23,11 +22,11 @@ jobs:
2322
TARGET="$BASE_BRANCH"
2423
2524
if [[ "$TARGET" == *-prod ]]; then
26-
if [[ "$SOURCE" == *-dev || "$SOURCE" == *-stg || "$SOURCE" == "hims-qa1" || "$SOURCE" == "hims-qa2" || "$SOURCE" == "development" ]]; then
25+
if [[ "$SOURCE" != *-hotfix && "$SOURCE" != "staging" ]]; then
2726
echo "❌ Merging from $SOURCE to $TARGET is not allowed."
2827
exit 1
2928
fi
30-
elif [[ "$TARGET" == *-stg || "$TARGET" == "-staging" ]]; then
29+
elif [[ "$TARGET" == "staging" ]]; then
3130
if [[ "$SOURCE" != "hims-qa1" && "$SOURCE" != "hims-qa2" ]]; then
3231
echo "❌ Only hims-qa1 and hims-qa2 can merge to $TARGET (staging restriction)."
3332
exit 1

‎.github/workflows/restart_all_servers.yml

+21
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,18 @@ on:
1111
description: 'Exclude QA(4.240.43.211)?'
1212
required: true
1313
type: boolean
14+
excludeShared01:
15+
description: 'Exclude Shared01(52.172.158.159)?'
16+
required: true
17+
type: boolean
18+
excludeShared02:
19+
description: 'Exclude Shared02(20.204.129.229)?'
20+
required: true
21+
type: boolean
22+
excludeD01:
23+
description: 'Exclude D01(4.213.180.217)?'
24+
required: true
25+
type: boolean
1426

1527
jobs:
1628
run_script_remote_server:
@@ -28,6 +40,15 @@ jobs:
2840
if [[ "${{ inputs.excludeQA }}" == "true" ]]; then
2941
EXCLUDED_SERVERS+="QA(4.240.43.211),"
3042
fi
43+
if [[ "${{ inputs.excludeShared01 }}" == "true" ]]; then
44+
EXCLUDED_SERVERS+="Shared01(52.172.158.159),"
45+
fi
46+
if [[ "${{ inputs.excludeShared02 }}" == "true" ]]; then
47+
EXCLUDED_SERVERS+="Shared02(20.204.129.229),"
48+
fi
49+
if [[ "${{ inputs.excludeD01 }}" == "true" ]]; then
50+
EXCLUDED_SERVERS+="D01(4.213.180.217),"
51+
fi
3152
3253
EXCLUDED_SERVERS=${EXCLUDED_SERVERS%,}
3354
echo "EXCLUDED_SERVERS=$EXCLUDED_SERVERS" >> $GITHUB_ENV

‎.github/workflows/restart_individual_servers.yml

+3
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,9 @@ on:
1818
options:
1919
- Development(4.240.39.63)
2020
- QA(4.240.43.211)
21+
- Shared01(52.172.158.159)
22+
- Shared02(20.204.129.229)
23+
- D01(4.213.180.217)
2124

2225
jobs:
2326
run_script_remote_server:

0 commit comments

Comments
 (0)