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.

Sign up for GitHub

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

Fix: CI flow on windows main #145

Merged
merged 5 commits into from
Nov 29, 2023
Merged

Fix: CI flow on windows main #145

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
19be78f
feat: remove useless step
SuZhou-Joe Nov 29, 2023
d8b5ac6
feat: add opensearch logs
SuZhou-Joe Nov 29, 2023
13acf57
feat: update
SuZhou-Joe Nov 29, 2023
f8d3164
feat: add more requestTimeout
SuZhou-Joe Nov 29, 2023
0d09c80
Merge branch 'main' into fix/ci-on-windows
Hailong-am Nov 29, 2023
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
7 changes: 0 additions & 7 deletions .github/workflows/dashboards-notifications-test-and-build-workflow-prod-docker-linux.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,13 +54,6 @@ jobs:
distribution: temurin # Temurin is a distribution of adoptium
java-version: 11

- name: Checkout Plugin
uses: actions/checkout@v2
with:
path: notifications
repository: opensearch-project/notifications
ref: '2.x'

- name: Check out the notifications repo
uses: actions/checkout@v2
with:
Expand Down
17 changes: 8 additions & 9 deletions .github/workflows/dashboards-notifications-test-and-build-workflow.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,13 +52,6 @@ jobs:
distribution: temurin # Temurin is a distribution of adoptium
java-version: 11

- name: Checkout Plugin
uses: actions/checkout@v2
with:
path: notifications
repository: opensearch-project/notifications
ref: '2.x'

# This is a hack, but this step creates a link to the X: mounted drive, which makes the path
# short enough to work on Windows
- name: Shorten Path
Expand Down Expand Up @@ -89,7 +82,7 @@ jobs:
brew install coreutils
fi
cd notifications/notifications
./gradlew run -Dopensearch.version=${{ env.OPENSEARCH_VERSION }} -x integTest -x jacocoTestReport &
./gradlew run -Dopensearch.version=${{ env.OPENSEARCH_VERSION }} -x integTest -x jacocoTestReport | tee -a opensearch.log &
timeout 300 bash -c 'while [[ "$(curl -s -o /dev/null -w ''%{http_code}'' localhost:9200)" != "200" ]]; do sleep 5; done'
shell: bash
env:
Expand Down Expand Up @@ -154,7 +147,7 @@ jobs:
- name: Run OpenSearch Dashboards server
run: |
cd ./OpenSearch-Dashboards
yarn start --no-base-path --no-watch --server.host="0.0.0.0" &
yarn start --no-base-path --no-watch --server.host="0.0.0.0" --opensearch.requestTimeout=120000 &
timeout 900 bash -c 'while [[ "$(curl -s http://localhost:5601/api/status | jq -r '.status.overall.state')" != "green" ]]; do echo sleeping 5; sleep 5; done'
curl -sk localhost:5601/api/status | jq
netstat -anp tcp | grep LISTEN | grep 5601 || netstat -ntlp | grep 5601
Expand Down Expand Up @@ -209,6 +202,12 @@ jobs:
name: cypress-screenshots-${{ matrix.os }}
path: OpenSearch-Dashboards/plugins/dashboards-notifications/.cypress/screenshots

- uses: actions/upload-artifact@v1
if: always()
with:
name: opensearch-logs-${{ matrix.os }}
path: notifications/notifications/opensearch.log

# Test run video was always captured, so this action uses "always()" condition
- uses: actions/upload-artifact@v1
if: always()
Expand Down
Loading