Skip to content

Commit

Permalink
Merge pull request #1664 from UCSF-IGHS/chore/update-ci-user
Browse files Browse the repository at this point in the history
(chore) update CI user
  • Loading branch information
ebambo authored Oct 20, 2023
2 parents 41d40a2 + b2caebc commit 5a72bb2
Show file tree
Hide file tree
Showing 2 changed files with 32 additions and 16 deletions.
17 changes: 17 additions & 0 deletions .github/pull_request_template.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
## Requirements

- [ ] This PR has a title that briefly describes the work done including the ticket number. If there is a ticket, make sure your PR title includes the ticket number in the format `OHRI-123 My PR title`.
- [ ] My work includes tests or is validated by existing tests.

## Summary
<!-- Please describe what problems your PR addresses. -->

## Screenshots
<!-- Required if you are making UI changes. -->

## Related Issue
<!-- Paste the link to the Jira ticket here if one exists. -->
<!-- https://ohri.atlassian.net/browse/OHRI- -->

## Other
<!-- Anything not covered above -->
31 changes: 15 additions & 16 deletions .github/workflows/node.js.yml
Original file line number Diff line number Diff line change
Expand Up @@ -136,7 +136,7 @@ jobs:
- name: Wait for 5 min - Let @esms reflect on NPM registry
run: sleep 300
- name: Checkout repository
uses: actions/checkout@v3
uses: actions/checkout@v3
- name: Login to Docker Hub
uses: docker/login-action@v2
with:
Expand All @@ -160,15 +160,15 @@ jobs:
cache-to: type=inline,ref=user/app:buildcache,mode=max

dev_server_status:
if: github.ref == 'refs/heads/dev'
if: github.ref == 'refs/heads/dev'
runs-on: ubuntu-latest
needs: docker_devserver_frontend

steps:
- name: Wait for 2 min - Let Images reflect on Docker Hub
run: sleep 300
- name: Checkout repository
uses: actions/checkout@v3
uses: actions/checkout@v3

- name: Copy files to /home/runner/
run: |
Expand All @@ -185,25 +185,25 @@ jobs:

- name: Check SSH to remote OHRI Dev status
run: |
ssh-keygen -R 172.19.0.16
ssh-keygen -R 172.19.0.16
dev_server_connection_dev:
runs-on: ubuntu-latest
needs: docker_devserver_frontend
steps:
- name: SSH to remote OHRI Dev server
run: |
ssh -o StrictHostKeyChecking=no -T llemos@172.19.0.16 -p 2216 -J llemos@20.172.182.46 -p 2202
steps:
- name: SSH to remote OHRI Dev server
run: |
ssh -o StrictHostKeyChecking=no -T ohri@172.19.0.16 -p 2216 -J ohri@20.172.182.46 -p 2202
ls -la -t && \
cd /opt && \
ls -la -t
ls -la -t
dev_deploy:
runs-on: ubuntu-latest
needs: docker_devserver_frontend

if: (github.event_name == 'push' || github.event.pull_request.merged)
if: (github.event_name == 'push' || github.event.pull_request.merged)

steps:
- name: Checkout code
uses: actions/checkout@v2
Expand All @@ -219,10 +219,9 @@ jobs:
ssh -p 2216 \
-o "UserKnownHostsFile=/dev/null" \
-o "StrictHostKeyChecking=no" \
-o "ProxyCommand=ssh -o StrictHostKeyChecking=no -W %h:%p llemos@20.172.182.46 -p 2202" \
llemos@172.19.0.16 "\
-o "ProxyCommand=ssh -o StrictHostKeyChecking=no -W %h:%p ohri@20.172.182.46 -p 2202" \
ohri@172.19.0.16 "\
cd /opt && \
docker compose -f docker-compose-ohri-dev.yml pull && \
docker compose -f docker-compose-ohri-dev.yml stop && \
docker compose -f docker-compose-ohri-dev.yml up -d"

0 comments on commit 5a72bb2

Please sign in to comment.