Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Tracking pull request to merge main-release-jan-2024 to master #2750

Merged
merged 253 commits into from
Jan 31, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
253 commits
Select commit Hold shift + click to select a range
ba5feb8
chore: updated django backend image to newwer version to fix archive …
Oct 30, 2023
105253b
Merge pull request #2702 from bcgov/chore/alex-django-image-bump
AlexZorkin Oct 30, 2023
eae15f6
Merge pull request #2678 from bcgov/dependabot/pip/backend/urllib3-1.…
AlexZorkin Oct 30, 2023
938b663
fix: adjust credit transfer agreement date error message (#2469)
hamed-valiollahi Oct 31, 2023
0cda1c7
fix: adjust column widths in xls transactions sheet
hamed-valiollahi Oct 31, 2023
4982840
fix: removed 2023 option from compliance report dropdown
kevin-hashimoto Oct 31, 2023
555a819
Merge pull request #2708 from bcgov/fix/hamed-adjust-xls-transactions…
AlexZorkin Nov 1, 2023
efdd0ab
Merge pull request #2706 from bcgov/fix/hamed-adjust-agreement-date-e…
AlexZorkin Nov 1, 2023
719630f
fix: remove dropdown options 2023 and later
kevin-hashimoto Nov 1, 2023
9e4276a
Merge pull request #2709 from bcgov/fix/kevin-remove-2023-compliance-…
AlexZorkin Nov 1, 2023
0cadbf0
fix: remove 2023 >= option on dropdown
kevin-hashimoto Nov 2, 2023
369da7c
Merge branch 'release-2.12.0' into fix/kevin-remove-2023-compliance-o…
kevin-hashimoto Nov 2, 2023
b4a9157
fix: revert org status label changes on edit organization page
hamed-valiollahi Nov 2, 2023
17c9916
Merge pull request #2714 from bcgov/fix/hamed-revert-org-status-label…
AlexZorkin Nov 2, 2023
e75d215
Bump django from 3.2.20 to 3.2.23 in /backend
dependabot[bot] Nov 2, 2023
a3781b9
Merge pull request #2713 from bcgov/fix/kevin-remove-2023-compliance-…
AlexZorkin Nov 2, 2023
5e22530
Merge pull request #2715 from bcgov/dependabot/pip/backend/django-3.2.23
AlexZorkin Nov 2, 2023
ab6b941
Compliance Report slow loading time fix
protonater May 26, 2023
3a8acdf
review comments fixes
protonater May 27, 2023
6a58afc
remove cache logic
protonater May 30, 2023
992e708
Exclusion Report not visible to IDIR users fix
protonater Jun 7, 2023
5a6c166
feat: updated maxCredits service method to account for reserved credits
Jun 8, 2023
d2eaa11
fix: updated cache_key to sanitize spaces
Jun 9, 2023
05393ec
bug and failed test cases fix
prv-proton Jun 13, 2023
d8a3886
revert unintended squash change
Jun 15, 2023
eb5cd7f
WIP
jig-patel Jun 20, 2023
19ddf2d
Unit test in progress
jig-patel Jun 22, 2023
8b36b76
compliance units update
jig-patel Jun 23, 2023
8841474
Compliance Unit changes to compliance report spreadsheet
protonater Jun 23, 2023
e20bc1b
add pr build template
kuanfandevops Jun 29, 2023
4ea3030
update
kuanfandevops Jun 30, 2023
eed05f1
add new pipeline
kuanfandevops Jul 4, 2023
41dd7bf
trigger build
kuanfandevops Jul 4, 2023
b949a66
update to use env
kuanfandevops Jul 4, 2023
8933013
update parameters
kuanfandevops Jul 4, 2023
a0b8263
add brancj build
kuanfandevops Jul 4, 2023
dd6732e
get branch name
kuanfandevops Jul 4, 2023
78fefb3
pass branch name
kuanfandevops Jul 4, 2023
6a5c996
add frontend build
kuanfandevops Jul 4, 2023
63d82d9
correct frontend build
kuanfandevops Jul 4, 2023
7a2b01f
add test
kuanfandevops Jul 4, 2023
5b86ea1
update version
kuanfandevops Jul 4, 2023
48f9645
Build frontend and backend for Jan pipeline (#2421)
kuanfandevops Jul 6, 2023
f6991fc
Update from 2.7.0 to 3.0.0
kuanfandevops Jul 6, 2023
952a7a2
Update Jan pipeline (#2433)
kuanfandevops Jul 7, 2023
24f9857
Update frontend route.yaml
kuanfandevops Jul 7, 2023
f41419a
update frontend host
kuanfandevops Jul 7, 2023
8fae217
update frontend host remove dep
kuanfandevops Jul 7, 2023
1c6ef9a
update frontend host name
kuanfandevops Jul 7, 2023
2b7d0ac
open build
kuanfandevops Jul 7, 2023
cb84623
open deploy dep
kuanfandevops Jul 7, 2023
1983655
Replace Credits and Debits with Compliance Units in Compliance Repor…
prv-proton Jul 7, 2023
172dd3c
add for supplemental reports
prv-proton Jul 7, 2023
b512272
added backend changes
prv-proton Jul 11, 2023
55a1432
code enhancement
prv-proton Jul 11, 2023
8d07d65
january 2024 label updates, lint fixes, snapshot updates
Jul 19, 2023
917e5ea
director acceptance
jig-patel Jul 20, 2023
0386313
initial
prv-proton Jul 19, 2023
84f6b74
permission changes with migration
prv-proton Jul 21, 2023
8eba9d5
director acceptance
jig-patel Jul 18, 2023
c438369
spreadsheet changes to compliance report as per new act
protonater Jul 21, 2023
e5f91e2
remove print lines
prv-proton Jul 21, 2023
16fea19
remove print lines
prv-proton Jul 21, 2023
f4770d5
remove unwanted changes
prv-proton Jul 21, 2023
e7f3c1e
Add pull request build for Jan release (#2463)
kuanfandevops Jul 25, 2023
08987e7
fix defects
kuanfandevops Jul 25, 2023
816e628
update readme
kuanfandevops Jul 31, 2023
24b1bd9
WIP
jig-patel Jul 31, 2023
3461b7d
adding schedule B row add fix
jig-patel Aug 1, 2023
991543c
removing consol.log statment
jig-patel Aug 2, 2023
5ccf31b
Bug fix for the draft compliance unit
protonater Aug 7, 2023
1d88012
Place compliance units in reserve when submitting a 2023 compliance r…
jig-patel Aug 11, 2023
db603bc
updating check for a year
jig-patel Aug 11, 2023
55d4bc8
Part 2 Summary not populating values from Schedule B/C fixes to 2507
protonater Aug 11, 2023
9b202e1
Update ScheduleSummaryContainer
prv-proton Aug 11, 2023
bcab354
System converts credits to compliance units when accepting a complica…
prv-proton Aug 16, 2023
368e5d8
Revert "System converts credits to compliance units when accepting a …
prv-proton Aug 16, 2023
6e4dd6f
feat: only show active orgs in credit transfer selection
Aug 16, 2023
a3d87e3
Compliance unit bug fixes and test cases
prv-proton Aug 17, 2023
13a52ff
minor fixes
protonater Aug 17, 2023
5f70936
Line 28 comments fix
prv-proton Aug 18, 2023
d9ac2a6
calculation error fix
prv-proton Aug 18, 2023
0d505cb
test scenarios
protonater Aug 21, 2023
d45e2d1
adding test cases for compliance units
protonater Aug 22, 2023
ae3089e
feat: updated organization label column for status to registered
Aug 16, 2023
dad2f04
labels for organization edit, details, and create views
Aug 16, 2023
5ba450f
feat: added more flexible filtering to org registered column
Aug 17, 2023
4ec1f56
Prevent Inactive organization from transferring credits buy or sell
jig-patel Aug 17, 2023
5568c48
System converting credits to compliance units for 2023 prior complian…
protonater Aug 16, 2023
c396503
feat: new credit transaction type added to system administrative adju…
Aug 8, 2023
67655af
fix: unit test updates
Aug 9, 2023
b6fc295
fixed migration order
Aug 9, 2023
22ceeca
fix: missing id
Aug 9, 2023
d59d9c0
fix: negative frontend validation
Aug 9, 2023
b34f06f
rebase fix
Aug 16, 2023
a9192e6
UI changes
prv-proton Aug 22, 2023
67e4574
delta changes fix
prv-proton Aug 22, 2023
fed8ccb
minor UI fixes
prv-proton Aug 22, 2023
0f79a82
Compliance Report Spreadsheet fix for date in summary section
protonater Aug 23, 2023
7fe6b58
Compliance Unit Edge test cases for backend
protonater Aug 24, 2023
da63062
comment change
prv-proton Aug 24, 2023
85da17a
include migration for test cases
protonater Aug 25, 2023
0cb4996
name conventions fix
prv-proton Aug 25, 2023
1b81e17
supplemntal bug fix for compliance units reporting
prv-proton Aug 28, 2023
9ad140a
chore: merged migrations from rebase
Aug 30, 2023
16c84f8
fix: get summary test fix
Aug 30, 2023
42db381
Remove Actions and Last Transaction column from Organizations table (…
jig-patel Sep 5, 2023
e2a13f1
Report History section grouping status changes incorrectly -fix (#2582)
prv-proton Sep 5, 2023
8d98914
Feat: Label updates for Part 3 Awards, File Submissions - 2491 2492 (…
AlexZorkin Sep 5, 2023
e54b791
fix: refactored get summary method and fixed scenario
Sep 8, 2023
3d46ded
Bug for reserve compliance units when submitted.
prv-proton Sep 11, 2023
96bdbf5
connect to crunchydb (#2608)
kuanfandevops Sep 13, 2023
0206044
fix for Summary section of compliance units to show changes
prv-proton Sep 12, 2023
6c26d16
minor fix
prv-proton Sep 12, 2023
045b094
fix
prv-proton Sep 12, 2023
bddb70e
code optimization
prv-proton Sep 12, 2023
b8942b4
comments for reference
prv-proton Sep 12, 2023
71295c3
code optimize
prv-proton Sep 12, 2023
b3d8a7f
optimize
prv-proton Sep 12, 2023
9f592a3
minor fixes
prv-proton Sep 12, 2023
af780c1
penalty miscalculation fix
prv-proton Sep 13, 2023
902e736
status fix revert
prv-proton Sep 13, 2023
b3ece19
adding fix for routing issue of credit/debit
jig-patel Sep 14, 2023
21b4865
File Submission tab label changes
prv-proton Sep 14, 2023
5ae1c61
fix: added missing get_deltas method to update compliance report method
Sep 15, 2023
286d443
chore: linting, snapshots, test updates
Sep 15, 2023
d79cfc9
Compliance Unit changes bug fixes for all the scenarios covered.
prv-proton Sep 19, 2023
a35bc1b
scenario 17 fix
prv-proton Sep 19, 2023
1207566
remove redundant code
prv-proton Sep 19, 2023
241585e
fix for TFRS - Scenario 10 not showing the correct math for calculati…
jig-patel Sep 18, 2023
2ff2d43
scenario 8 fix
prv-proton Sep 20, 2023
62ad266
code optimize
prv-proton Sep 20, 2023
61767f7
TFRS new act label revisions - removing referenes to credits 2583
prv-proton Sep 20, 2023
dcbcb3e
fix for Analyst recommend transfer approval buttons not appearing in …
jig-patel Sep 23, 2023
2a34fcc
feat: unit test for zero scenario 3
Sep 26, 2023
76975d4
fix for Inaccurate compliant non-compliant determination in the asses…
jig-patel Sep 27, 2023
e2793db
Remove/hide balance change in Assessment Section
prv-proton Sep 28, 2023
6aa5e4c
feat: updated tooltip for compliance units
Sep 27, 2023
30c5ca9
feat: check for zero balance on director acceptance
Sep 27, 2023
ef362f1
fix: unit test update
Sep 27, 2023
0934ffc
Feat: Part 3 Award Label updates 2603
prv-proton Sep 30, 2023
76acc76
feat: lables updated according to spec
Sep 29, 2023
c07e22e
chore: linting fixes and snapshots
Sep 29, 2023
c1522a3
Feat: Dashboard Label updates 2474
prv-proton Sep 30, 2023
731a875
Adminstrative Adjustment changes 2431 2583
prv-proton Oct 3, 2023
dd4869c
chore: updated snapshots and linting
Oct 3, 2023
ac05395
chore: snapshots updated
Oct 3, 2023
9f3d390
bug fix for non compliance penalty issue
prv-proton Oct 4, 2023
632733a
code optimize
prv-proton Oct 4, 2023
222e069
minor fixes
prv-proton Oct 4, 2023
df84450
minor fix
prv-proton Oct 4, 2023
87ed24e
fix: formatting fix on react-markdown
Oct 6, 2023
c933a65
New Act Label Changes - Transactions view page using HDE - time based…
jig-patel Oct 10, 2023
b881cfe
TFRS - Summary & Declaration page not loading for 2022 and prior comp…
jig-patel Oct 5, 2023
f100b34
chore: fixed unit tests for older cases
Oct 6, 2023
7f276e0
Updates and fixes for bugs found during testing
prv-proton Oct 6, 2023
996a9a8
label updates
prv-proton Oct 6, 2023
4ee45df
fix: updated logic to prevent zero transactions
Oct 6, 2023
4c9627c
New Act labels - transaction status change based on time
prv-proton Oct 11, 2023
c7d9cd0
TFRS - Time-based transaction label changes for the new Act#2601
jig-patel Oct 13, 2023
a4650e5
New act label changes - Transactions Page 2495
prv-proton Oct 15, 2023
e96090a
fix: label updates for varied views
Oct 16, 2023
0e1a695
TFRS - Separate comment disclosure notice based on feature and commen…
jig-patel Oct 16, 2023
6f0e5eb
Update langEnUs.js
AlexZorkin Oct 16, 2023
5651a47
TFRS - New Act Label Changes - Transactions view page using HDE - tim…
jig-patel Oct 23, 2023
1251aa9
fix: logic fix on less than zero transactions
Oct 16, 2023
239d959
TFRS - Remove credit market link from BCeID and IDIR dashboards in Ja…
jig-patel Oct 17, 2023
accfabf
fix: label fixes on new initiative agreement, linting, unit tests
Oct 18, 2023
997f5ce
fixing wrong comment
jig-patel Oct 19, 2023
35e02fd
Fix: Filtering issues fix for Credit transactions and Compliance Reports
prv-proton Oct 30, 2023
0cf5766
TFRS - File submission filtering from dashboard link not working - ID…
jig-patel Nov 1, 2023
821cbb1
fix: updated transfer labels for BCeID users according to new Act
hamed-valiollahi Nov 3, 2023
dcfb8d3
refactor: changed error logging to warning and added raise in migration
hamed-valiollahi Nov 6, 2023
f9b2039
Merge pull request #2722 from bcgov/fix/hamed-transfer-act-label-chan…
AlexZorkin Nov 15, 2023
fae18a1
chore: merge master
Nov 16, 2023
529faa4
add jan release test deploy
kuanfandevops Nov 16, 2023
3bc2faa
specify branch name for jab test deploy
kuanfandevops Nov 17, 2023
69de409
add test deploy
kuanfandevops Nov 17, 2023
61a1659
add runs-on
kuanfandevops Nov 17, 2023
afb86a2
add runs-on
kuanfandevops Nov 17, 2023
f3d7088
add branches for workflow_dispatch
kuanfandevops Nov 17, 2023
7778e98
chore: merge master release 2.13.0
Nov 17, 2023
2ed55aa
add new value files for jan dry run
kuanfandevops Nov 17, 2023
234ad55
deploy jan release to test
kuanfandevops Nov 21, 2023
1c3d5c2
split test approval and deploy
kuanfandevops Nov 21, 2023
a83014b
fix: rearranged migration order to sync with main release branch
Nov 22, 2023
b26124f
fix: rearranged migration order to match master
Nov 22, 2023
daaccff
fix: updated migration order to match master for upcoming merge (#2742)
AlexZorkin Nov 22, 2023
1e99637
update pipeline merge install and upgrade
kuanfandevops Nov 23, 2023
3a91373
add notification sever
kuanfandevops Nov 23, 2023
0976f03
update notification server
kuanfandevops Nov 23, 2023
8e23602
update notification serverimage name
kuanfandevops Nov 23, 2023
9a4aea5
update notification certs url
kuanfandevops Nov 23, 2023
40deb30
add keycloak url and adjust resource
kuanfandevops Nov 23, 2023
5aff704
update knps for jan release
kuanfandevops Nov 24, 2023
97e4bcc
update existing network policy
kuanfandevops Nov 29, 2023
f533b29
fix: update labels and remove old features on add/edit organization
hamed-valiollahi Dec 15, 2023
afc3ddd
chore: reverted year limit on compliance report
Dec 16, 2023
6dc6445
Merge pull request #2758 from bcgov/chore/alex-2023-crs-268
AlexZorkin Dec 16, 2023
5e22b0d
refactor: lint fix, removed semicolons, switched to single quotes
hamed-valiollahi Dec 18, 2023
826053c
refactor: lint fix, removed extra commas
hamed-valiollahi Dec 18, 2023
2157923
fix: renamed label name following linting adjustments
hamed-valiollahi Dec 18, 2023
939b91d
fix: updated organization add/edit form test snapshot
hamed-valiollahi Dec 18, 2023
6b589f7
Merge pull request #2757 from bcgov/fix/hamed-update-org-add-edit-pag…
AlexZorkin Dec 21, 2023
2994c68
fix: updated labels
Jan 3, 2024
c822938
Merge pull request #2762 from bcgov/fix/alex-label-updates-275-276
AlexZorkin Jan 5, 2024
de64999
fix: fixed non status related loading for file submissions page
Jan 9, 2024
8605ff5
Merge pull request #2776 from bcgov/fix/alex-file-submissions-not-loa…
AlexZorkin Jan 9, 2024
0f2f8da
fix: revise error message for insufficient compliance units
hamed-valiollahi Jan 9, 2024
1c24c6e
fix: fix wrong labels in transfer confirmation modal
hamed-valiollahi Jan 9, 2024
7f84f46
fix: fix broken file submission link on BCeID dashboard
hamed-valiollahi Jan 9, 2024
1d49146
Merge pull request #2779 from bcgov/fix/hamed-update-transfer-labels-…
AlexZorkin Jan 9, 2024
7ca993f
Merge pull request #2778 from bcgov/fix/hamed-revise-transfer-error-m…
AlexZorkin Jan 9, 2024
64eb52e
fix: TFRS - Update Notification descriptions to align with new Act la…
prv-proton Jan 9, 2024
7313966
fix: hide lcfs email on org details page for idir users
hamed-valiollahi Jan 9, 2024
d2bff15
Merge pull request #2777 from bcgov/fix/hamed-hide-lcfs-email-for-idi…
AlexZorkin Jan 9, 2024
c19281d
Merge pull request #2780 from bcgov/fix/hamed-fix-broken-file-submiss…
AlexZorkin Jan 9, 2024
2a07530
Merge pull request #2783 from bcgov/fix/prashanth-notification-desc-u…
AlexZorkin Jan 9, 2024
deb175c
add jab release drawino and upgrade autoscaling apiVersion
kuanfandevops Jan 9, 2024
1e79b18
update char number
kuanfandevops Jan 9, 2024
b3ed70b
test workflow
kuanfandevops Jan 9, 2024
772b62e
disable auto scaling for dev
kuanfandevops Jan 9, 2024
1ca61ca
update autoscaling version
kuanfandevops Jan 10, 2024
fec601f
update teh workflow to fast deployment
kuanfandevops Jan 10, 2024
2c796da
open the test and linting
kuanfandevops Jan 10, 2024
abc85bd
feat: TFRS - Adjust 'Part 3 Award' label for transaction type in the …
prv-proton Jan 11, 2024
76a2fb5
fix: fix incorrect labels in initiative agreement issuance transaction
hamed-valiollahi Jan 12, 2024
9ee9d2e
fix: update labels in notifications settings as per new act
hamed-valiollahi Jan 12, 2024
63cc54e
fix: update bceid and idir guide links to external urls
hamed-valiollahi Jan 12, 2024
5afb944
fix: correct labels in transfer confirmation modal
hamed-valiollahi Jan 12, 2024
7b8dfdd
fix: correct effective date of transfer 2095
hamed-valiollahi Jan 12, 2024
2682f87
HDE Transactions efective date fix in spreadsheet
protonater Jan 12, 2024
bd72908
Merge pull request #2788 from bcgov/feat/prashanth-label-update-histo…
AlexZorkin Jan 13, 2024
25397e0
Merge pull request #2791 from bcgov/fix/hamed-initiative-agreement-la…
AlexZorkin Jan 13, 2024
7364a4d
Merge pull request #2792 from bcgov/fix/hamed-notifications-labels-up…
AlexZorkin Jan 13, 2024
f9369f7
Merge pull request #2793 from bcgov/fix/hamed-update-user-guide-links…
AlexZorkin Jan 13, 2024
c64962f
Merge pull request #2794 from bcgov/fix/hamed-correct-labels-transfer…
AlexZorkin Jan 13, 2024
9cf00cd
Merge pull request #2796 from bcgov/fix/prashanth-hde-effective-dt-fi…
AlexZorkin Jan 13, 2024
c2b4891
fix: fixes on label and compliance years
Jan 13, 2024
40f5381
Merge pull request #2797 from bcgov/fix/alex-label-fixes-240112
AlexZorkin Jan 13, 2024
0708d03
fix: add a reverse noop to avoid downgrade issues
hamed-valiollahi Jan 15, 2024
e99930a
Merge pull request #2795 from bcgov/fix/hamed-correct-effective-date-…
AlexZorkin Jan 16, 2024
bb7a576
fix part 3 label in the historical data entry table
prv-proton Jan 16, 2024
bc307d8
fix: update two notification lables
hamed-valiollahi Jan 16, 2024
4fd21d6
fix: update modal confirmLabel logic to handle different transaction …
hamed-valiollahi Jan 16, 2024
7e0cb6f
Merge pull request #2801 from bcgov/fix/prashanth-hde-part3-label-fix…
AlexZorkin Jan 16, 2024
57b84a1
Merge pull request #2802 from bcgov/fix/hamed-notifications-labels-up…
AlexZorkin Jan 16, 2024
99fe06c
Merge pull request #2803 from bcgov/fix/hamed-correct-labels-transfer…
AlexZorkin Jan 16, 2024
fcc5c11
fix: fix compliance period year of transfer 2095
hamed-valiollahi Jan 18, 2024
4d80c71
Merge pull request #2808 from bcgov/fix/hamed-correct-effective-date-…
AlexZorkin Jan 19, 2024
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 10 additions & 1 deletion .github/readme.md
Original file line number Diff line number Diff line change
Expand Up @@ -40,8 +40,17 @@
* tfrs-release.yaml (TFRS release-2.10.0): the pipeline builds the release and deploys on Test and Prod, it needs to be manually triggered
* create-release.yaml (Create Release after merging to master): tag and create the release after merging release branch to master. The description of the tracking pull request becomes release notes

* dev-jan-release.yaml (TFRS Dev Jan Release): the pipeline build Jan 2024 release and deploy on dev for every commit
* dev-release.yaml (TFRS Dev release-2.9.0): the pipeline is automatically triggered when there is a commit to the release branch
* tfrs-release.yaml (TFRS release-2.9.0): the pipelin builds the release and deploy on Test and Prod, it needs to be manually triggered

## Other Pipelines

* branch-deploy-template.yaml (Branch Deploy Template): a pipeline template to deploy a branch
* build-template.yaml (Build Template): a pipeline template to build branch or pull request
* cleanup-cron-workflow-runs.yaml (Scheduled cleanup old workflow runs): a cron job to cleanup the old workflows
* cleanup-workflow-runs.yaml (Cleanup old workflow runs): manually cleanup teh workflow runs

* pr-dev-cicd.yaml (TFRS Dev Jan PR CICD): the pipeline builds Jan 2024 pull requests and deploy on dev if the pull request title ends with build-on-dev
* pr-dev-database-template.yaml (PR Dev Database Template): the template to create database for pull request build
* pr-deploy-template (PR Dev Deploy Template): the template deploys pull request build to dev
* pr-teardown.yaml (TFRS Dev Jan PR Teardown): tear down the Jan 2024 pull request builds from dev
142 changes: 142 additions & 0 deletions .github/workflows/branch-deploy-template.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,142 @@
name: Branch Deploy Template

on:
workflow_call:
inputs:
branch-name: # sample value: release-2.9.0 or main-release-jan-2024
required: true
type: string
# suffix is in format of -dev, -test, -dev-jan, test-jan, -dev-1923, dev-jan-1923
suffix:
required: true
type: string
# env-name is in format of dev, test
env-name:
required: true
type: string
# database-service-host-name, sample tfrs-spilo, tfrs-spilo-jan, tfrs-spilo-dev-1988
database-service-host-name:
required: true
type: string
# this virtual host name, sample tfrs-jan-vhost
rabbitmq-vhost:
required: true
type: string
secrets:
tools-namespace:
required: true
namespace:
required: true
openshift-server:
required: true
openshift-token:
required: true

jobs:

deploy:

name: Deploy tfrs
runs-on: ubuntu-latest
timeout-minutes: 60

steps:

- name: Check out repository
uses: actions/checkout@v3
with:
ref: ${{ inputs.branch-name }}

- name: Log in to Openshift
uses: redhat-actions/[email protected]
with:
openshift_server_url: ${{ secrets.openshift-server }}
openshift_token: ${{ secrets.openshift-token }}
insecure_skip_tls_verify: true
namespace: ${{ secrets.tools-namespace }}

- name: Deploy tfrs-frontend
shell: bash {0}
run: |
oc tag ${{ secrets.tools-namespace }}/tfrs-frontend:build-${{ inputs.branch-name }} ${{ secrets.namespace }}/tfrs-frontend:${{ inputs.env-name }}-${{ inputs.branch-name }}
cd charts/tfrs-apps/charts/tfrs-frontend
helm status -n ${{ secrets.namespace }} tfrs-frontend${{ inputs.suffix }}
helm upgrade --install \
--set frontendImageTagName=${{ inputs.env-name }}-${{ inputs.branch-name }} \
--set suffix=${{ inputs.suffix }} \
--set namespace=${{ secrets.namespace }} \
--set envName=${{ inputs.env-name }} \
-n ${{ secrets.namespace }} -f ./values${{ inputs.suffix }}.yaml tfrs-frontend${{ inputs.suffix }} .

- name: Deploy tfrs-backend
shell: bash {0}
run: |
oc tag ${{ secrets.tools-namespace }}/tfrs-backend:build-${{ inputs.branch-name }} ${{ secrets.namespace }}/tfrs-backend:${{ inputs.env-name }}-${{ inputs.branch-name }}
cd charts/tfrs-apps/charts/tfrs-backend
helm status -n ${{ secrets.namespace }} tfrs-backend${{ inputs.suffix }}
helm upgrade --install \
--set backendImageTagName=${{ inputs.env-name }}-${{ inputs.branch-name }} \
--set suffix=${{ inputs.suffix }} \
--set namespace=${{ secrets.namespace }} \
--set envName=${{ inputs.env-Name }} \
--set databaseServiceHostName=${{ inputs.database-service-host-name }} \
--set rabbitmqVHost=${{ inputs.rabbitmq-vhost }} \
-n ${{ secrets.namespace }} -f ./values${{ inputs.suffix }}.yaml tfrs-backend${{ inputs.suffix }} .

- name: Deploy tfrs-celery
shell: bash {0}
run: |
oc tag ${{ secrets.tools-namespace }}/tfrs-celery:build-${{ inputs.branch-name }} ${{ secrets.namespace }}/tfrs-celery:${{ inputs.env-name }}-${{ inputs.branch-name }}
cd charts/tfrs-apps/charts/tfrs-celery
helm status -n ${{ secrets.namespace }} tfrs-celery${{ inputs.suffix }}
helm upgrade --install \
--set celeryImageTagName=${{ inputs.env-name }}-${{ inputs.branch-name }} \
--set suffix=${{ inputs.suffix }} \
--set namespace=${{ secrets.namespace }} \
--set envName=${{ inputs.env-Name }} \
--set databaseServiceHostName=${{ inputs.database-service-host-name }} \
--set rabbitmqVHost=${{ inputs.rabbitmq-vhost }} \
-n ${{ secrets.namespace }} -f ./values${{ inputs.suffix }}.yaml tfrs-celery${{ inputs.suffix }} .

- name: Deploy tfrs-scan-handler
shell: bash {0}
run: |
oc tag ${{ secrets.tools-namespace }}/tfrs-scan-handler:build-${{ inputs.branch-name }} ${{ secrets.namespace }}/tfrs-scan-handler:${{ inputs.env-name }}-${{ inputs.branch-name }}
cd charts/tfrs-apps/charts/tfrs-scan-handler
helm status -n ${{ secrets.namespace }} tfrs-scan-handler${{ inputs.suffix }}
helm upgrade --install \
--set scanHandlerImageTagName=${{ inputs.env-name }}-${{ inputs.branch-name }} \
--set suffix=${{ inputs.suffix }} \
--set namespace=${{ secrets.namespace }} \
--set envName=${{ inputs.env-Name }} \
--set databaseServiceHostName=${{ inputs.database-service-host-name }} \
--set rabbitmqVHost=${{ inputs.rabbitmq-vhost }} \
-n ${{ secrets.namespace }} -f ./values${{ inputs.suffix }}.yaml tfrs-scan-handler${{ inputs.suffix }} .

- name: Deploy tfrs-scan-coordinator
shell: bash {0}
run: |
oc tag ${{ secrets.tools-namespace }}/tfrs-scan-coordinator:build-${{ inputs.branch-name }} ${{ secrets.namespace }}/tfrs-scan-coordinator:${{ inputs.env-name }}-${{ inputs.branch-name }}
cd charts/tfrs-apps/charts/tfrs-scan-coordinator
helm status -n ${{ secrets.namespace }} tfrs-scan-coordinator${{ inputs.suffix }}
helm upgrade --install \
--set scanCoordinatorImageTagName=${{ inputs.env-name }}-${{ inputs.branch-name }} \
--set suffix=${{ inputs.suffix }} \
--set namespace=${{ secrets.namespace }} \
--set envName=${{ inputs.env-Name }} \
--set rabbitmqVHost=${{ inputs.rabbitmq-vhost }} \
-n ${{ secrets.namespace }} -f ./values${{ inputs.suffix }}.yaml tfrs-scan-coordinator${{ inputs.suffix }} .

- name: Deploy tfrs-notification-server
shell: bash {0}
run: |
oc tag ${{ secrets.tools-namespace }}/tfrs-notification-server:build-${{ inputs.branch-name }} ${{ secrets.namespace }}/tfrs-notification-server:${{ inputs.env-name }}-${{ inputs.branch-name }}
cd charts/tfrs-apps/charts/tfrs-notification-server
helm status -n ${{ secrets.namespace }} tfrs-notification-server${{ inputs.suffix }}
helm upgrade --install \
--set notificationServerImageTagName=${{ inputs.env-name }}-${{ inputs.branch-name }} \
--set suffix=${{ inputs.suffix }} \
--set namespace=${{ secrets.namespace }} \
--set envName=${{ inputs.env-Name }} \
--set rabbitmqVHost=${{ inputs.rabbitmq-vhost }} \
-n ${{ secrets.namespace }} -f ./values${{ inputs.suffix }}.yaml tfrs-notification-server${{ inputs.suffix }} .
233 changes: 233 additions & 0 deletions .github/workflows/build-template.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,233 @@

# This template supports both pr build and branch build
name: Build Template

on:
workflow_call:
inputs:
# when build branch, the sample value is -main-release-jan-2024
# when build pull request, the sample value is -jan-2024
suffix:
required: true
type: string
# when build branch, the sample value is main-release-jan-2024
# when build pull request, the sample value is refs/pull/2024/head
checkout-ref:
required: true
type: string
secrets:
tools-namespace:
required: true
openshift-server:
required: true
openshift-token:
required: true

env:
GIT_URL: https://github.com/bcgov/tfrs.git

jobs:

build-backend:

name: Build TFRS Backend on Openshift
runs-on: ubuntu-latest
timeout-minutes: 60

steps:

- name: Check out repository
uses: actions/[email protected]
with:
ref: ${{ inputs.checkout-ref }}

- name: Log in to Openshift
uses: redhat-actions/[email protected]
with:
openshift_server_url: ${{ secrets.openshift-server }}
openshift_token: ${{ secrets.openshift-token }}
insecure_skip_tls_verify: true
namespace: ${{ secrets.tools-namespace }}

- name: Build tfrs Backend
run: |
cd openshift-v4/templates/backend
oc process -f ./backend-bc.yaml NAME=tfrs \
SUFFIX=-build${{ inputs.suffix}} \
VERSION=build${{ inputs.suffix }} \
GIT_URL=${{ env.GIT_URL }} \
GIT_REF=${{ inputs.checkout-ref }} \
| oc apply --wait=true -f - -n ${{ secrets.tools-namespace }}
oc cancel-build bc/tfrs-backend-build${{ inputs.suffix}} -n ${{ secrets.tools-namespace }} || true
oc start-build --wait=true tfrs-backend-build${{ inputs.suffix}} -n ${{ secrets.tools-namespace }}

build-frontend:

name: Build TFRS Frontend on Openshift
runs-on: ubuntu-latest
timeout-minutes: 60

steps:

- name: Check out repository
uses: actions/[email protected]
with:
ref: ${{ inputs.checkout-ref }}

- name: Log in to Openshift
uses: redhat-actions/[email protected]
with:
openshift_server_url: ${{ secrets.openshift-server }}
openshift_token: ${{ secrets.openshift-token }}
insecure_skip_tls_verify: true
namespace: ${{ secrets.tools-namespace }}

- name: Build TFRS Frontend
run: |
cd openshift-v4/templates/frontend
oc process -f ./frontend-bc-docker.yaml NAME=tfrs \
SUFFIX=-build${{ inputs.suffix}} \
VERSION=build${{ inputs.suffix }} \
GIT_URL=${{ env.GIT_URL }} \
GIT_REF=${{ inputs.checkout-ref }} \
| oc apply --wait=true -f - -n ${{ secrets.tools-namespace }}
oc cancel-build bc/tfrs-frontend-build${{ inputs.suffix}} -n ${{ secrets.tools-namespace }} || true
oc start-build --wait=true tfrs-frontend-build${{ inputs.suffix}} -n ${{ secrets.tools-namespace }}

build-celery:

name: Build TFRS Celery on Openshift
needs: [build-frontend, build-backend]
runs-on: ubuntu-latest
timeout-minutes: 60

steps:

- name: Check out repository
uses: actions/[email protected]
with:
ref: ${{ inputs.checkout-ref }}

- name: Log in to Openshift
uses: redhat-actions/[email protected]
with:
openshift_server_url: ${{ secrets.openshift-server }}
openshift_token: ${{ secrets.openshift-token }}
insecure_skip_tls_verify: true
namespace: ${{ secrets.tools-namespace }}

- name: Build TFRS Celery
run: |
cd openshift-v4/templates/celery
pwd
ls -l
oc process -f ./celery-bc-docker.yaml NAME=tfrs \
SUFFIX=-build${{ inputs.suffix}} \
VERSION=build${{ inputs.suffix }} \
GIT_URL=${{ env.GIT_URL }} \
GIT_REF=${{ inputs.checkout-ref }} \
| oc apply --wait=true -f - -n ${{ secrets.tools-namespace }}
oc cancel-build bc/tfrs-celery-build${{ inputs.suffix}} -n ${{ secrets.tools-namespace }} || true
oc start-build --wait=true tfrs-celery-build${{ inputs.suffix}} -n ${{ secrets.tools-namespace }}

build-scan-coordinator:

name: Build TFRS Scan Coordinator on Openshift
needs: [build-frontend, build-backend]
runs-on: ubuntu-latest
timeout-minutes: 60

steps:

- name: Check out repository
uses: actions/[email protected]
with:
ref: ${{ inputs.checkout-ref }}

- name: Log in to Openshift
uses: redhat-actions/[email protected]
with:
openshift_server_url: ${{ secrets.openshift-server }}
openshift_token: ${{ secrets.openshift-token }}
insecure_skip_tls_verify: true
namespace: ${{ secrets.tools-namespace }}

- name: Build TFRS Scan Coordinator
run: |
cd openshift-v4/templates/scan-coordinator
oc process -f ./scan-coordinator-bc.yaml NAME=tfrs \
SUFFIX=-build${{ inputs.suffix}} \
VERSION=build${{ inputs.suffix }} \
GIT_URL=${{ env.GIT_URL }} \
GIT_REF=${{ inputs.checkout-ref }} \
| oc apply --wait=true -f - -n ${{ secrets.tools-namespace }}
oc cancel-build bc/tfrs-scan-coordinator-build${{ inputs.suffix}} -n ${{ secrets.tools-namespace }} || true
oc start-build --wait=true tfrs-scan-coordinator-build${{ inputs.suffix}} -n ${{ secrets.tools-namespace }}

build-scan-handler:

name: Build TFRS Scan Handler on Openshift
needs: [build-scan-coordinator, build-celery]
runs-on: ubuntu-latest
timeout-minutes: 60

steps:

- name: Check out repository
uses: actions/[email protected]
with:
ref: ${{ inputs.checkout-ref }}

- name: Log in to Openshift
uses: redhat-actions/[email protected]
with:
openshift_server_url: ${{ secrets.openshift-server }}
openshift_token: ${{ secrets.openshift-token }}
insecure_skip_tls_verify: true
namespace: ${{ secrets.tools-namespace }}

- name: Build TFRS Scan-Handler
run: |
cd openshift-v4/templates/scan-handler
oc process -f ./scan-handler-bc-docker.yaml NAME=tfrs \
SUFFIX=-build${{ inputs.suffix}} \
VERSION=build${{ inputs.suffix }} \
GIT_URL=${{ env.GIT_URL }} \
GIT_REF=${{ inputs.checkout-ref }} \
| oc apply --wait=true -f - -n ${{ secrets.tools-namespace }}
oc cancel-build bc/tfrs-scan-handler-build${{ inputs.suffix}} -n ${{ secrets.tools-namespace }} || true
oc start-build --wait=true tfrs-scan-handler-build${{ inputs.suffix}} -n ${{ secrets.tools-namespace }}

build-notification-server:

name: Build TFRS Notification Server on Openshift
needs: [build-scan-coordinator, build-celery]
runs-on: ubuntu-latest
timeout-minutes: 60

steps:

- name: Check out repository
uses: actions/[email protected]
with:
ref: ${{ inputs.checkout-ref }}

- name: Log in to Openshift
uses: redhat-actions/[email protected]
with:
openshift_server_url: ${{ secrets.openshift-server }}
openshift_token: ${{ secrets.openshift-token }}
insecure_skip_tls_verify: true
namespace: ${{ secrets.tools-namespace }}

- name: Build TFRS Notification Server
run: |
cd openshift-v4/templates/notification
oc process -f ./notification-server-bc.yaml NAME=tfrs \
SUFFIX=-build${{ inputs.suffix}} \
VERSION=build${{ inputs.suffix }} \
GIT_URL=${{ env.GIT_URL }} \
GIT_REF=${{ inputs.checkout-ref }} \
| oc apply --wait=true -f - -n ${{ secrets.tools-namespace }}
oc cancel-build bc/tfrs-notification-server-build${{ inputs.suffix}} -n ${{ secrets.tools-namespace }} || true
oc start-build --wait=true tfrs-notification-server-build${{ inputs.suffix}} -n ${{ secrets.tools-namespace }}
Loading
Loading