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

UAT Release IS-95 #4542

Merged
merged 45 commits into from
Dec 19, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
45 commits
Select commit Hold shift + click to select a range
3320b01
PSP-9565: Changes on automation test set to accomodate GHA (#4516)
stairaku Dec 5, 2024
623b443
CI: Bump version to v5.7.0-94.21
github-actions[bot] Dec 5, 2024
2ebb2e6
psp-9500 Scheduler microservice (#4483)
devinleighsmith Dec 5, 2024
2fe0a65
CI: Bump version to v5.7.0-94.22
github-actions[bot] Dec 5, 2024
503faf5
Bump version to IS95 (#4518)
asanchezr Dec 5, 2024
a95fc62
CI: Bump version to v5.7.0-95.1
github-actions[bot] Dec 5, 2024
b5d9fa7
PSP-9569 : H 120 document- Generated document shows full names, inste…
eddherrera Dec 6, 2024
bf7f5e2
CI: Bump version to v5.7.0-95.2
github-actions[bot] Dec 6, 2024
6c79bc3
Github action fixes (#4520)
asanchezr Dec 6, 2024
069d2df
CI: Bump version to v5.7.0-95.3
github-actions[bot] Dec 6, 2024
310729b
Lease Historical file alignment fix (#4521)
stairaku Dec 9, 2024
cb54fec
CI: Bump version to v5.7.0-95.4
github-actions[bot] Dec 9, 2024
13d66bb
PSP-9517 Remove "cannot determine" region dropdown from User Manageme…
asanchezr Dec 9, 2024
66081f6
CI: Bump version to v5.7.0-95.5
github-actions[bot] Dec 9, 2024
e1ab3f1
Adding requested tooltip on View and Update forms (#4523)
stairaku Dec 9, 2024
7c1a210
CI: Bump version to v5.7.0-95.6
github-actions[bot] Dec 9, 2024
5e4f896
IS-95.00 Database Schema (#4511)
dfilteau Dec 9, 2024
201d531
CI: Bump version to v5.7.0-95.7
github-actions[bot] Dec 9, 2024
312a3fa
IS 95 scaffold (#4525)
FuriousLlama Dec 9, 2024
d2fb89b
CI: Bump version to v5.7.0-95.8
github-actions[bot] Dec 9, 2024
7801b74
PSP-9283 : UI UX Clean Up - Acquisition - Stakeholders - edit button …
eddherrera Dec 10, 2024
07d022e
CI: Bump version to v5.7.0-95.9
github-actions[bot] Dec 10, 2024
bb9be64
PSP-8923: UI UX Clean Up - Left Side Menu - Clicked icon stage (#4526)
stairaku Dec 10, 2024
2183180
CI: Bump version to v5.7.0-95.10
github-actions[bot] Dec 10, 2024
38e8fcc
Remove unecessary SetOriginalConcurrencyControlNumber method. (#4527)
devinleighsmith Dec 16, 2024
f8248ad
CI: Bump version to v5.7.0-95.11
github-actions[bot] Dec 16, 2024
127175e
PSP-9279 UI UX - Acquisition - Agreements & Expropriation - UI Button…
asanchezr Dec 16, 2024
8209d25
CI: Bump version to v5.7.0-95.12
github-actions[bot] Dec 16, 2024
b964adc
psp-9632 limit the default bounds when resetting. (#4533)
devinleighsmith Dec 16, 2024
f21bc05
CI: Bump version to v5.7.0-95.13
github-actions[bot] Dec 16, 2024
9ea5bd9
psp-9715 fix issues adding properties with no locations, and also ove…
devinleighsmith Dec 16, 2024
2c4433f
CI: Bump version to v5.7.0-95.14
github-actions[bot] Dec 16, 2024
e652ff8
[CI] Fix build failures after ubuntu-latest upgrade to 24.04 (#4537)
asanchezr Dec 17, 2024
dea99af
CI: Bump version to v5.7.0-95.15
github-actions[bot] Dec 17, 2024
ab9e7dc
psp-9457 prevent disposed properties from being added to leases. (#4532)
devinleighsmith Dec 17, 2024
8efee0e
CI: Bump version to v5.7.0-95.16
github-actions[bot] Dec 17, 2024
8ca90a8
disposition override corrections - ensure save redirect functions. (#…
devinleighsmith Dec 17, 2024
56b6c5e
CI: Bump version to v5.7.0-95.17
github-actions[bot] Dec 17, 2024
2aa9ddb
psp-9530 allow research files to add retired properties. (#4534)
devinleighsmith Dec 19, 2024
769c835
CI: Bump version to v5.7.0-95.18
github-actions[bot] Dec 19, 2024
491b29b
PSP-8573 | Updated list headers (#4531)
FuriousLlama Dec 19, 2024
5f48f1c
CI: Bump version to v5.7.0-95.19
github-actions[bot] Dec 19, 2024
9b33fa7
PSP-9655 : FT-REG: When creating a new file approximately after 4pm P…
eddherrera Dec 19, 2024
e6990dc
CI: Bump version to v5.7.0-95.20
github-actions[bot] Dec 19, 2024
1e70990
Merge remote-tracking branch 'upstream/dev' into uat-release-is95
asanchezr Dec 19, 2024
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
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
Loading