Skip to content

Commit

Permalink
Assembly notifications in CI.
Browse files Browse the repository at this point in the history
Signed-off-by: dblock <dblock@amazon.com>
  • Loading branch information
dblock committed Aug 16, 2021
1 parent 32a68f3 commit 0ffae38
Show file tree
Hide file tree
Showing 6 changed files with 39 additions and 30 deletions.
34 changes: 18 additions & 16 deletions .github/workflows/multi-node-test-workflow.yml
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,9 @@ jobs:
- name: Build common-utils
working-directory: ./common-utils
run: ./gradlew publishToMavenLocal -Dopensearch.version=1.1.0-SNAPSHOT
# index-management
- name: Checkout Branch
uses: actions/checkout@v2
# dependencies: job-scheduler
- name: Checkout job-scheduler
uses: actions/checkout@v2
Expand All @@ -54,27 +57,26 @@ jobs:
working-directory: ./job-scheduler
run: |
./gradlew assemble -Dopensearch.version=1.1.0-SNAPSHOT
echo "Creating ../src/test/resources/job-scheduler ..."
mkdir -p ../src/test/resources/job-scheduler
pwd
echo "Copying ./build/distributions/*.zip to ../src/test/resources/job-scheduler ..."
ls ./build/distributions/
cp ./build/distributions/*.zip ../src/test/resources/job-scheduler
echo "Copied ./build/distributions/*.zip to ../src/test/resources/job-scheduler ..."
ls ../src/test/resources/job-scheduler
# dependencies: alerting-notification
- name: Checkout alerting
# dependencies: notifications
- name: Checkout notifications
uses: actions/checkout@v2
with:
repository: 'opensearch-project/alerting'
path: alerting
ref: 'main'
- name: Build alerting
working-directory: ./alerting
run: ./gradlew :alerting-notification:publishToMavenLocal -Dopensearch.version=1.1.0-SNAPSHOT
# index-management
- name: Checkout Branch
uses: actions/checkout@v2
repository: 'dblock/notifications'
path: notifications
ref: 'fix-snapshot-build'
- name: Build notifications
working-directory: ./notifications/notifications
run: ./gradlew publishToMavenLocal -Dopensearch.version=1.1.0-SNAPSHOT
- name: Assemble notifications
working-directory: ./notifications/notifications
run: |
./gradlew assemble -Dopensearch.version=1.1.0-SNAPSHOT
mkdir -p ../../src/test/resources/notifications
cp ./build/distributions/*.zip ../../src/test/resources/notifications
ls ../../src/test/resources/notifications
- name: Run integration tests with multi node config
run: ./gradlew integTest -PnumNodes=3 -Dopensearch.version=1.1.0-SNAPSHOT
- name: Upload failed logs
Expand Down
28 changes: 15 additions & 13 deletions .github/workflows/test-and-build-workflow.yml
Original file line number Diff line number Diff line change
Expand Up @@ -57,24 +57,26 @@ jobs:
working-directory: ./job-scheduler
run: |
./gradlew assemble -Dopensearch.version=1.1.0-SNAPSHOT
echo "Creating ../src/test/resources/job-scheduler ..."
mkdir -p ../src/test/resources/job-scheduler
pwd
echo "Copying ./build/distributions/*.zip to ../src/test/resources/job-scheduler ..."
ls ./build/distributions/
cp ./build/distributions/*.zip ../src/test/resources/job-scheduler
echo "Copied ./build/distributions/*.zip to ../src/test/resources/job-scheduler ..."
ls ../src/test/resources/job-scheduler
# dependencies: alerting
- name: Checkout alerting
# dependencies: notifications
- name: Checkout notifications
uses: actions/checkout@v2
with:
repository: 'opensearch-project/alerting'
path: alerting
ref: 'main'
- name: Build alerting
working-directory: ./alerting
run: ./gradlew :alerting-notification:publishToMavenLocal -Dopensearch.version=1.1.0-SNAPSHOT
repository: 'dblock/notifications'
path: notifications
ref: 'fix-snapshot-build'
- name: Build notifications
working-directory: ./notifications/notifications
run: ./gradlew publishToMavenLocal -Dopensearch.version=1.1.0-SNAPSHOT
- name: Assemble notifications
working-directory: ./notifications/notifications
run: |
./gradlew assemble -Dopensearch.version=1.1.0-SNAPSHOT
mkdir -p ../../src/test/resources/notifications
cp ./build/distributions/*.zip ../../src/test/resources/notifications
ls ../../src/test/resources/notifications
# build index management
- name: Build with Gradle
run: ./gradlew build -Dopensearch.version=1.1.0-SNAPSHOT
Expand Down
1 change: 0 additions & 1 deletion build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -165,7 +165,6 @@ dependencies {
compile "org.jetbrains.kotlin:kotlin-stdlib-common:${kotlin_version}"
compile 'org.jetbrains.kotlinx:kotlinx-coroutines-core:1.3.9'
compile "org.jetbrains:annotations:13.0"
compile "org.opensearch:notification:${alerting_version}"
compile "org.opensearch:common-utils:${common_utils_version}"
compile "com.github.seancfoley:ipaddress:5.3.3"

Expand Down
3 changes: 3 additions & 0 deletions src/test/resources/job-scheduler/.gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
# Build and copy opensearch-job-scheduler-1.x-SNAPSHOT.zip from https://github.com/opensearch-project/job-scheduler here.

*.zip
3 changes: 3 additions & 0 deletions src/test/resources/notifications/.gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
# Build and copy opensearch-notifications-1.x-SNAPSHOT.zip from https://github.com/opensearch-project/notifications/notifications here.

*.zip
Binary file not shown.

0 comments on commit 0ffae38

Please sign in to comment.