Commit edbac474 authored by Luc Yriarte's avatar Luc Yriarte Committed by Anuj Gupta
Browse files

Do not allow pipeline failures for IBM

parent 20edfe5a
...@@ -199,8 +199,3 @@ osdu-gcp-test: ...@@ -199,8 +199,3 @@ osdu-gcp-test:
ibm-deploy: ibm-deploy:
allow_failure: true allow_failure: true
# Allow failure on integration tests
ibm-test:
allow_failure: true
...@@ -6,7 +6,7 @@ from app.utils import Context ...@@ -6,7 +6,7 @@ from app.utils import Context
from .app_injector import AppInjector, AppInjectorModule from .app_injector import AppInjector, AppInjectorModule
from app.bulk_persistence import resolve_tenant from app.bulk_persistence import resolve_tenant
from app.bulk_persistence.dask.dask_bulk_storage import DaskBulkStorage from app.bulk_persistence.dask.dask_bulk_storage import DaskBulkStorage
from osdu_ibm.storage.dask_storage_parameters import get_dask_storage_parameters as ibm_parameters from osdu_ibm.storage.dask_storage_parameters import DaskStorageParametersFactoryIBM
class IBMInjector(AppInjectorModule): class IBMInjector(AppInjectorModule):
...@@ -26,8 +26,8 @@ class IBMInjector(AppInjectorModule): ...@@ -26,8 +26,8 @@ class IBMInjector(AppInjectorModule):
@staticmethod @staticmethod
async def build_ibm_dask_blob_storage() -> DaskBulkStorage: async def build_ibm_dask_blob_storage() -> DaskBulkStorage:
# raise NotImplementedError() daskstoragefactory = DaskStorageParametersFactoryIBM()
ctx: Context = Context.current() ctx: Context = Context.current()
tenant = await resolve_tenant(ctx.partition_id) tenant = await resolve_tenant(ctx.partition_id)
params = await ibm_parameters(tenant) params = await daskstoragefactory.get_dask_storage_parameters(tenant)
return await DaskBulkStorage.create(params) return await DaskBulkStorage.create(params)
...@@ -24,6 +24,8 @@ dask[distributed]==2021.7.2 ...@@ -24,6 +24,8 @@ dask[distributed]==2021.7.2
fsspec fsspec
python-ulid python-ulid
s3fs==2021.8.0 s3fs==2021.8.0
aiobotocore[boto3]
--extra-index-url \ --extra-index-url \
https://community.opengroup.org/api/v4/projects/465/packages/pypi/simple/ https://community.opengroup.org/api/v4/projects/465/packages/pypi/simple/
...@@ -32,7 +34,7 @@ osdu-log-recognition-lib>=0.0.9 ...@@ -32,7 +34,7 @@ osdu-log-recognition-lib>=0.0.9
osdu-data-ecosystem-storage~=1.2.0 osdu-data-ecosystem-storage~=1.2.0
osdu-data-ecosystem-search>=0.3.2, <0.4 osdu-data-ecosystem-search>=0.3.2, <0.4
osdu-core-lib-python-ibm~=1.2.0 osdu-core-lib-python-ibm==1.3.0
osdu-core-lib-python-gcp~=1.1.0 osdu-core-lib-python-gcp~=1.1.0
osdu-core-lib-python-azure~=1.2.1 osdu-core-lib-python-azure~=1.2.1
osdu-core-lib-python-aws>=0.0.3, <0.1 osdu-core-lib-python-aws>=0.0.3, <0.1
......
...@@ -10,8 +10,10 @@ adal==1.2.7 ...@@ -10,8 +10,10 @@ adal==1.2.7
# via azure-datalake-store # via azure-datalake-store
adlfs==0.7.7 adlfs==0.7.7
# via osdu-core-lib-python-azure # via osdu-core-lib-python-azure
aiobotocore==1.4.1 aiobotocore[boto3]==1.4.1
# via s3fs # via
# -r requirements.in
# s3fs
aiohttp==3.7.4.post0 aiohttp==3.7.4.post0
# via # via
# -r requirements.in # -r requirements.in
...@@ -70,7 +72,9 @@ azure-storage-blob==12.8.1 ...@@ -70,7 +72,9 @@ azure-storage-blob==12.8.1
backoff==1.11.1 backoff==1.11.1
# via -r requirements.in # via -r requirements.in
boto3==1.17.106 boto3==1.17.106
# via osdu-core-lib-python-ibm # via
# aiobotocore
# osdu-core-lib-python-ibm
botocore==1.20.106 botocore==1.20.106
# via # via
# aiobotocore # aiobotocore
...@@ -103,6 +107,8 @@ cloudpickle==1.6.0 ...@@ -103,6 +107,8 @@ cloudpickle==1.6.0
# via # via
# dask # dask
# distributed # distributed
colorama==0.4.4
# via click
cryptography==3.4.7 cryptography==3.4.7
# via # via
# -r requirements.in # -r requirements.in
...@@ -251,7 +257,7 @@ osdu-core-lib-python-azure==1.2.1 ...@@ -251,7 +257,7 @@ osdu-core-lib-python-azure==1.2.1
# via -r requirements.in # via -r requirements.in
osdu-core-lib-python-gcp==1.1.0 osdu-core-lib-python-gcp==1.1.0
# via -r requirements.in # via -r requirements.in
osdu-core-lib-python-ibm==1.2.0 osdu-core-lib-python-ibm==1.3.0
# via -r requirements.in # via -r requirements.in
osdu-data-ecosystem-search==0.3.3 osdu-data-ecosystem-search==0.3.3
# via -r requirements.in # via -r requirements.in
...@@ -317,6 +323,8 @@ pytz==2021.1 ...@@ -317,6 +323,8 @@ pytz==2021.1
# via # via
# google-api-core # google-api-core
# pandas # pandas
# pywin32==301
# via portalocker
pyyaml==5.4.1 pyyaml==5.4.1
# via # via
# dask # dask
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment