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

TASK-4428 - Ability to handle Ext-Tools for OpenCGA #2303

Merged
merged 6 commits into from
Jun 29, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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/develop.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,13 +13,6 @@ jobs:
with:
maven_opts: -P storage-hadoop,hdp3.1,RClient,opencga-storage-hadoop-deps -Dopencga.war.name=opencga -Dcheckstyle.skip -pl '!:opencga-storage-hadoop-deps-emr6.1,!:opencga-storage-hadoop-deps-hdp2.6'

deploy-docker-ext-tools:
uses: opencb/java-common-libs/.github/workflows/deploy-docker-hub-workflow.yml@develop
needs: build
with:
cli: python3 ./build/cloud/docker/docker-build.py push --images ext-tools --tag ${{ needs.build.outputs.version }}
secrets: inherit

test:
uses: ./.github/workflows/test-analysis.yml
needs: deploy-docker-ext-tools
Expand Down
2 changes: 0 additions & 2 deletions .github/workflows/docker-aws-emr.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,5 +18,3 @@ jobs:
with:
cli: python3 ./build/cloud/docker/docker-build.py push --images base,init
secrets: inherit
# DOCKER_HUB_USER: ${{ secrets.DOCKER_HUB_USER }}
# DOCKER_HUB_PASSWORD: ${{ secrets.DOCKER_HUB_PASSWORD }}
23 changes: 23 additions & 0 deletions .github/workflows/docker-ext-tools.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
name: Deploy Docker Ext-Tools

on:
push:
branches:
- develop
- release-*
- TASK-*
paths:
- opencga-app/app/cloud/docker/opencga-ext-tools/Dockerfile
workflow_dispatch:

jobs:
build:
uses: opencb/java-common-libs/.github/workflows/build-java-app-workflow.yml@develop

deploy-docker-ext-tools:
uses: opencb/java-common-libs/.github/workflows/deploy-docker-hub-workflow.yml@develop
needs: build
with:
cli: python3 ./build/cloud/docker/docker-build.py push --images ext-tools --tag ${{ needs.build.outputs.version }}
secrets: inherit

17 changes: 0 additions & 17 deletions .github/workflows/docker-tools.yml

This file was deleted.

26 changes: 14 additions & 12 deletions .github/workflows/long-test-analysis.yml
Original file line number Diff line number Diff line change
@@ -1,15 +1,17 @@
name: Long test for run only on weekend

#Every Saturday at 01:10
#on:
# schedule:
# - cron: '10 1 * * 6'
#
#jobs:
# test:
# uses: ./.github/workflows/test-analysis.yml
# secrets: inherit
# with:
# test_profile: runLongTests,runMediumTests,runShortTests
# report_context: development

## Every Saturday at 01:10
on:
schedule:
- cron: '10 1 * * 6'

jobs:
test:
uses: ./.github/workflows/test-analysis.yml
secrets: inherit
with:
test_profile: runLongTests,runMediumTests,runShortTests
report_context: development


7 changes: 5 additions & 2 deletions .github/workflows/pull-request-merge.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,12 +3,15 @@ name: "Pull Request Merge Workflow"
on:
pull_request:
branches:
- "develop"
- "release-*"
- develop
- release-*
types:
- closed

jobs:
build:
uses: opencb/java-common-libs/.github/workflows/build-java-app-workflow.yml@develop

delete-docker:
uses: opencb/java-common-libs/.github/workflows/delete-docker-hub-workflow.yml@develop
with:
Expand Down
7 changes: 0 additions & 7 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,13 +12,6 @@ jobs:
with:
maven_opts: -P storage-hadoop,hdp3.1,RClient,opencga-storage-hadoop-deps -Dopencga.war.name=opencga -Dcheckstyle.skip -pl '!:opencga-storage-hadoop-deps-emr6.1,!:opencga-storage-hadoop-deps-hdp2.6'

deploy-docker-ext-tools:
uses: opencb/java-common-libs/.github/workflows/deploy-docker-hub-workflow.yml@develop
needs: build
with:
cli: python3 ./build/cloud/docker/docker-build.py push --images ext-tools --tag ${{ needs.build.outputs.version }}
secrets: inherit

deploy-maven:
uses: opencb/java-common-libs/.github/workflows/deploy-maven-repository-workflow.yml@develop
needs: test
Expand Down
3 changes: 2 additions & 1 deletion .github/workflows/task.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,8 @@ on:
- TASK-*
workflow_dispatch:

#WARNING Develop branch needed for prod
# WARNING Develop branch needed for prod

jobs:
build:
uses: opencb/java-common-libs/.github/workflows/build-java-app-workflow.yml@develop
Expand Down
2 changes: 1 addition & 1 deletion opencga-app/app/cloud/docker/opencga-ext-tools/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -30,4 +30,4 @@ RUN apt-get update -y && DEBIAN_FRONTEND="noninteractive" TZ="Europe/London" apt
rm -rf /var/lib/apt/lists/* /tmp/* /opt/opencga/signature.tools.lib/.git && \
strip --remove-section=.note.ABI-tag /usr/lib/x86_64-linux-gnu/libQt5Core.so.5

WORKDIR /opt/opencga
WORKDIR /opt/opencga
Loading