Skip to content

Commit

Permalink
UAT Release IS-95 (#4542)
Browse files Browse the repository at this point in the history
* PSP-9565: Changes on automation test set to accomodate GHA (#4516)

* data changes

* Testing browsers

* changing .net 6.0 to .net 8.0

* Deleting EdgeDriver nuget package

* Changes on webdriver config

* Update integration-test.yml

* Changes on automation test set - IS94

* Changes to adapt GHA

* Changing checklist button to explicit path

* Correcting a research file element

* CI: Bump version to v5.7.0-94.21

* psp-9500 Scheduler microservice (#4483)

* split off geoserver functionality into a microservice - update docker and ci/cd to support.

* psp-9500 scheduler microservice.

* change service scope

* Readme updates.

* github action corrections.

---------

Co-authored-by: Smith <[email protected]>

* CI: Bump version to v5.7.0-94.22

* Bump version to IS95 (#4518)

* CI: Bump version to v5.7.0-95.1

* PSP-9569 : H 120 document- Generated document shows full names, inste… (#4519)

Co-authored-by: Herrera <[email protected]>

* CI: Bump version to v5.7.0-95.2

* Github action fixes (#4520)

* CI: Bump version to v5.7.0-95.3

* Lease Historical file alignment fix (#4521)

Co-authored-by: Alejandro Sanchez <[email protected]>

* CI: Bump version to v5.7.0-95.4

* PSP-9517 Remove "cannot determine" region dropdown from User Management screen under Admin Tools (#4522)

* Remove "Cannot determine" region from user management page

* Test updates

* CI: Bump version to v5.7.0-95.5

* Adding requested tooltip on View and Update forms (#4523)

* CI: Bump version to v5.7.0-95.6

* IS-95.00 Database Schema (#4511)

* IS-95.00 Database Schema

PSP_PIMS | Development Sprint: S95.00 | Design Sprint: 94 | Date: 2024-Dec-03
- Altered tables:
  - PIMS_ACQUISITION_FILE
  - PIMS_ACQUISITION_FILE_HIST
  - PIMS_COMPENSATION_REQUISITION
  - PIMS_COMPENSATION_REQUISITION_HIST
  - PIMS_EXPROPRIATION_PAYMENT
  - PIMS_EXPROPRIATION_PAYMENT_HIST
- Added build script:
  - 007_PSP_PIMS_COMPENSATION_REQUISITION_HIST_Add.sql
- Altered build script:
  - 007_PSP_PIMS_ACQUISITION_FILE_HIST_Add.sql
- Altered test script:
  - 043_PIMS_ACQUISITION_FILE.sql
- Requires additional metadata to meet standards

* Fixed alter down

* Aligning to LATEST

---------

Co-authored-by: Manuel Rodriguez <[email protected]>
Co-authored-by: Alejandro Sanchez <[email protected]>

* CI: Bump version to v5.7.0-95.7

* IS 95 scaffold (#4525)

* Generated scaffold

* Fixed backend compilation and removed todos.

* CI: Bump version to v5.7.0-95.8

* PSP-9283 : UI UX Clean Up - Acquisition - Stakeholders - edit button (#4524)

Co-authored-by: Herrera <[email protected]>

* CI: Bump version to v5.7.0-95.9

* PSP-8923: UI UX Clean Up - Left Side Menu - Clicked icon stage (#4526)

* Adding new yellow tone color

* Adding highlighted color to selected path on the side Menu

* Color format change

* update snapshots

---------

Co-authored-by: Alejandro Sanchez <[email protected]>

* CI: Bump version to v5.7.0-95.10

* Remove unecessary SetOriginalConcurrencyControlNumber method. (#4527)

* CI: Bump version to v5.7.0-95.11

* PSP-9279 UI UX - Acquisition - Agreements & Expropriation - UI Button update for consistency  (#4528)

* PSP-9279 UI UX cleanup - make generate buttons consistent

* Update snapshots

* Test updates

* CI: Bump version to v5.7.0-95.12

* psp-9632 limit the default bounds when resetting. (#4533)

Co-authored-by: Smith <[email protected]>
Co-authored-by: Alejandro Sanchez <[email protected]>

* CI: Bump version to v5.7.0-95.13

* psp-9715 fix issues adding properties with no locations, and also override research file property updates. (#4530)

Co-authored-by: Alejandro Sanchez <[email protected]>

* CI: Bump version to v5.7.0-95.14

* [CI] Fix build failures after ubuntu-latest upgrade to 24.04 (#4537)

* CI: Bump version to v5.7.0-95.15

* psp-9457 prevent disposed properties from being added to leases. (#4532)

* CI: Bump version to v5.7.0-95.16

* disposition override corrections - ensure save redirect functions. (#4536)

Co-authored-by: Alejandro Sanchez <[email protected]>

* CI: Bump version to v5.7.0-95.17

* psp-9530 allow research files to add retired properties. (#4534)

* psp-9530 allow research files to add retired properties.

* fix test compilation error.

---------

Co-authored-by: Alejandro Sanchez <[email protected]>

* CI: Bump version to v5.7.0-95.18

* PSP-8573 | Updated list headers (#4531)

* Updated list headers

* Added icons

* Fixed Typos

* lint fixes

---------

Co-authored-by: Alejandro Sanchez <[email protected]>

* CI: Bump version to v5.7.0-95.19

* PSP-9655 : FT-REG: When creating a new file approximately after 4pm P… (#4540)

* PSP-9655 : FT-REG: When creating a new file approximately after 4pm PST timezone, PIMS timestamps the file with the next day's date

* - test updates

* - test updates

---------

Co-authored-by: Herrera <[email protected]>
Co-authored-by: Alejandro Sanchez <[email protected]>

* CI: Bump version to v5.7.0-95.20

---------

Co-authored-by: Sue Tairaku <[email protected]>
Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
Co-authored-by: devinleighsmith <[email protected]>
Co-authored-by: Smith <[email protected]>
Co-authored-by: Eduardo <[email protected]>
Co-authored-by: Herrera <[email protected]>
Co-authored-by: Doug Filteau <[email protected]>
Co-authored-by: Manuel Rodriguez <[email protected]>
  • Loading branch information
9 people authored Dec 19, 2024
1 parent 063fa1e commit c3ef1f2
Show file tree
Hide file tree
Showing 460 changed files with 89,296 additions and 2,353 deletions.
16 changes: 12 additions & 4 deletions .github/workflows/api-dotnetcore.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ on:
jobs:
# JOB to run change detection
check-changes:
runs-on: ubuntu-latest
runs-on: ubuntu-22.04
# Set job outputs to values from filter step
outputs:
backend: ${{ steps.filter.outputs.backend }}
Expand All @@ -24,11 +24,19 @@ jobs:
build-backend:
needs: check-changes
runs-on: ubuntu-latest
runs-on: ubuntu-22.04
if: ${{ needs.check-changes.outputs.backend == 'true' }}
strategy:
matrix:
services: [{directory: ./source/backend/api, solution: 'Pims.sln'}, {directory: ./source/backend/proxy, solution: 'Proxy.sln'}]
services:
[
{ directory: ./source/backend/api, solution: "Pims.sln" },
{ directory: ./source/backend/proxy, solution: "Proxy.sln" },
{
directory: ./source/backend/scheduler,
solution: "Scheduler.sln",
},
]
env:
working-directory: ${{ matrix.services.directory }}
solution-name: ${{ matrix.services.solution }}
Expand Down Expand Up @@ -147,7 +155,7 @@ jobs:
sonarHostname: ${{secrets.SONAR_URL}}
post-build:
needs: build-backend
runs-on: ubuntu-latest
runs-on: ubuntu-22.04
env:
working-directory: ./source/backend
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
Expand Down
87 changes: 42 additions & 45 deletions .github/workflows/app-logging.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,14 +6,11 @@ on:
pull_request:
branches: [master, test, dev]


jobs:

build:

name: build-logging
if: github.event.ref == 'refs/heads/master' || github.event.ref == 'refs/heads/test' || github.event.ref == 'refs/heads/dev'
runs-on: ubuntu-latest
runs-on: ubuntu-22.04
env:
SLEEP_TIME: 60
STORAGE_TYPE: Amazon_S3
Expand All @@ -32,44 +29,44 @@ jobs:
working-directory: ./openshift/4.0/templates/Logging

steps:
- uses: actions/checkout@v4
- name: Set ENV variable
run: |
if [[ ${{github.event.ref}} == 'refs/heads/test' ]]; then
echo "FRONTEND_APP_NAME=pims-app-test" >> $GITHUB_ENV
echo "API_NAME=pims-api-test" >> $GITHUB_ENV
elif [[ ${{github.event.ref}} == 'refs/heads/master' ]]; then
echo "FRONTEND_APP_NAME=pims-app-uat" >> $GITHUB_ENV
echo "API_NAME=pims-api-uat" >> $GITHUB_ENV
echo "PROJECT_NAMESPACE=3cd915-test" >> $GITHUB_ENV
else
echo "FRONTEND_APP_NAME=pims-app" >> $GITHUB_ENV
echo "API_NAME=pims-api" >> $GITHUB_ENV
fi
- name: Build the pims-logging docker-compose stack
run: docker-compose -f docker-compose.yml up -d
working-directory: ${{env.working-directory}}
- name: Sleep for 180 seconds
uses: jakejarvis/wait-action@master
with:
time: '180s'
- name: Check Extracted Logs
run: |
docker cp pims-logging:/logging/. .
exitcode=$(docker inspect pims-logging --format='{{.State.ExitCode}}')
if [[ "$(ls -A pims* 2>/dev/null | wc -l)" != "0" ]]; then
ls -A pims* && rm -f pims*
elif [[ $exitcode == 0 ]]; then
echo "Info: No log captured between sleep time"
else
echo "There's an error capturing pims logs" && exit 1
fi
- name: Check running containers
run: docker ps -a
- name: Check pims-logging logs
if: always()
run: docker logs pims-logging
- name: Stop containers
if: always()
run: docker-compose -f "docker-compose.yml" down
working-directory: ${{env.working-directory}}
- uses: actions/checkout@v4
- name: Set ENV variable
run: |
if [[ ${{github.event.ref}} == 'refs/heads/test' ]]; then
echo "FRONTEND_APP_NAME=pims-app-test" >> $GITHUB_ENV
echo "API_NAME=pims-api-test" >> $GITHUB_ENV
elif [[ ${{github.event.ref}} == 'refs/heads/master' ]]; then
echo "FRONTEND_APP_NAME=pims-app-uat" >> $GITHUB_ENV
echo "API_NAME=pims-api-uat" >> $GITHUB_ENV
echo "PROJECT_NAMESPACE=3cd915-test" >> $GITHUB_ENV
else
echo "FRONTEND_APP_NAME=pims-app" >> $GITHUB_ENV
echo "API_NAME=pims-api" >> $GITHUB_ENV
fi
- name: Build the pims-logging docker-compose stack
run: docker-compose -f docker-compose.yml up -d
working-directory: ${{env.working-directory}}
- name: Sleep for 180 seconds
uses: jakejarvis/wait-action@master
with:
time: "180s"
- name: Check Extracted Logs
run: |
docker cp pims-logging:/logging/. .
exitcode=$(docker inspect pims-logging --format='{{.State.ExitCode}}')
if [[ "$(ls -A pims* 2>/dev/null | wc -l)" != "0" ]]; then
ls -A pims* && rm -f pims*
elif [[ $exitcode == 0 ]]; then
echo "Info: No log captured between sleep time"
else
echo "There's an error capturing pims logs" && exit 1
fi
- name: Check running containers
run: docker ps -a
- name: Check pims-logging logs
if: always()
run: docker logs pims-logging
- name: Stop containers
if: always()
run: docker-compose -f "docker-compose.yml" down
working-directory: ${{env.working-directory}}
4 changes: 2 additions & 2 deletions .github/workflows/app-react.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ on:
jobs:
# JOB to run change detection
check-changes:
runs-on: ubuntu-latest
runs-on: ubuntu-22.04
# Set job outputs to values from filter step
outputs:
frontend: ${{ steps.filter.outputs.frontend }}
Expand All @@ -25,7 +25,7 @@ jobs:
build-frontend:
needs: check-changes
if: ${{ needs.check-changes.outputs.frontend == 'true' }}
runs-on: ubuntu-latest
runs-on: ubuntu-22.04
env:
CI: true
working-directory: ./source/frontend
Expand Down
29 changes: 16 additions & 13 deletions .github/workflows/ci-cd-pims-dev.yml
Original file line number Diff line number Diff line change
Expand Up @@ -27,15 +27,12 @@ env:
DEPLOYMENT_NAMESPACE: "3cd915-dev"

on:
pull_request_target:
branches: [dev]
types: [closed]
workflow_dispatch:

jobs:
ci-cd-start-notification:
if: github.event.pull_request.merged == true
name: CI-CD Start Notification to Teams Channel
runs-on: ubuntu-latest
runs-on: ubuntu-22.04
steps:
- name: Start notification to Teams Channel
uses: dragos-cojocari/[email protected]
Expand All @@ -49,7 +46,7 @@ jobs:
build-frontend:
name: Build frontend
needs: ci-cd-start-notification
runs-on: ubuntu-latest
runs-on: ubuntu-22.04
steps:
- name: Checkout Source Code
uses: actions/checkout@v4
Expand All @@ -68,7 +65,7 @@ jobs:
build-api:
name: Build api
needs: ci-cd-start-notification
runs-on: ubuntu-latest
runs-on: ubuntu-22.04
steps:
- name: Checkout Source Code
uses: actions/checkout@v4
Expand All @@ -83,11 +80,12 @@ jobs:
run: |
./openshift/4.0/player.sh build api -apply
./openshift/4.0/player.sh build proxy -apply
./openshift/4.0/player.sh build scheduler -apply
deploy:
name: Deploy to OpenShift
needs: [build-frontend, build-api]
runs-on: ubuntu-latest
runs-on: ubuntu-22.04
steps:
- name: Checkout Source Code
uses: actions/checkout@v4
Expand Down Expand Up @@ -116,6 +114,12 @@ jobs:
oc tag pims-proxy:latest-$DESTINATION pims-proxy:$DESTINATION
oc -n $DEPLOYMENT_NAMESPACE rollout restart deployment/pims-proxy-$DESTINATION
oc -n $DEPLOYMENT_NAMESPACE rollout status --timeout=600s deployment/pims-proxy-$DESTINATION
- name: Deploy scheduler microservice
shell: bash
run: |
oc tag pims-scheduler:latest-$DESTINATION pims-scheduler:$DESTINATION
oc -n $DEPLOYMENT_NAMESPACE rollout restart deployment/pims-scheduler-$DESTINATION
oc -n $DEPLOYMENT_NAMESPACE rollout status --timeout=600s deployment/pims-scheduler-$DESTINATION
- name: Deploy mayan
shell: bash
run: |
Expand All @@ -128,7 +132,7 @@ jobs:
database-upgrade:
name: Upgrade database
needs: [deploy]
runs-on: ubuntu-latest
runs-on: ubuntu-22.04
steps:
- name: Checkout Source Code
uses: actions/checkout@v4
Expand All @@ -151,7 +155,7 @@ jobs:
mayan-sync:
name: sync mayan
needs: database-upgrade
runs-on: ubuntu-latest
runs-on: ubuntu-22.04
steps:
- name: Checkout Source Code
uses: actions/checkout@v4
Expand All @@ -173,7 +177,7 @@ jobs:
keycloak-sync:
name: sync keycloak
needs: database-upgrade
runs-on: ubuntu-latest
runs-on: ubuntu-22.04
steps:
- name: Checkout Source Code
uses: actions/checkout@v4
Expand All @@ -191,9 +195,8 @@ jobs:
ci-cd-end-notification:
name: CI-CD End Notification to Teams Channel
runs-on: ubuntu-latest
runs-on: ubuntu-22.04
needs: keycloak-sync
if: ${{ always() && github.event.pull_request.merged == true }}
steps:
- name: check workflow status
uses: martialonline/workflow-status@v4
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/codecov-comment-pr.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ on:

jobs:
upload:
runs-on: ubuntu-latest
runs-on: ubuntu-22.04
if: >
github.event.workflow_run.event == 'pull_request' &&
github.event.workflow_run.conclusion == 'success'
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/credentials-comment-pr.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ on:
jobs:
# this action will leave a comment in response to credential scans performed on pull requests
on-completed:
runs-on: ubuntu-latest
runs-on: ubuntu-22.04
if: github.event.workflow_run.event == 'pull_request'
steps:
- uses: actions/checkout@v4
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/credentials-scan.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ on:

jobs:
credentials-scan:
runs-on: ubuntu-latest
runs-on: ubuntu-22.04

steps:
- uses: actions/checkout@v4
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/db-schma.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ on:
jobs:
build:
name: db-schema
runs-on: ubuntu-latest
runs-on: ubuntu-22.04
permissions:
actions: read
contents: read
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/deploy-prod-end.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ on:
jobs:
maintenance-page:
name: Hide the maintenance page
runs-on: ubuntu-latest
runs-on: ubuntu-22.04
steps:
- name: Checkout Source Code
uses: actions/checkout@v4
Expand All @@ -31,7 +31,7 @@ jobs:
ci-cd-end-notification:
name: CI-CD End Notification to Teams Channel
runs-on: ubuntu-latest
runs-on: ubuntu-22.04
needs: maintenance-page
steps:
- name: check workflow status
Expand Down
10 changes: 5 additions & 5 deletions .github/workflows/deploy-prod-start-argo.yml
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ on:
jobs:
ci-cd-start-notification:
name: CI-CD Start Notification to Teams Channel
runs-on: ubuntu-latest
runs-on: ubuntu-22.04
steps:
- name: Start notification to Teams Channel
uses: dragos-cojocari/[email protected]
Expand All @@ -48,7 +48,7 @@ jobs:

deploy:
name: Deploy frontend and api to OpenShift
runs-on: ubuntu-latest
runs-on: ubuntu-22.04
needs: ci-cd-start-notification
steps:
- name: Checkout Source Code
Expand Down Expand Up @@ -94,7 +94,7 @@ jobs:
database-upgrade:
name: Upgrade database
needs: [deploy]
runs-on: ubuntu-latest
runs-on: ubuntu-22.04
steps:
- name: Checkout Source Code
uses: actions/checkout@v4
Expand All @@ -117,7 +117,7 @@ jobs:
mayan-sync:
name: sync mayan
needs: database-upgrade
runs-on: ubuntu-latest
runs-on: ubuntu-22.04
steps:
- name: Checkout Source Code
uses: actions/checkout@v4
Expand All @@ -139,7 +139,7 @@ jobs:
keycloak-sync:
name: sync keycloak
needs: database-upgrade
runs-on: ubuntu-latest
runs-on: ubuntu-22.04
steps:
- name: Checkout Source Code
uses: actions/checkout@v4
Expand Down
Loading

0 comments on commit c3ef1f2

Please sign in to comment.