Commit 414e0e55 authored by Yakubov, Sergey's avatar Yakubov, Sergey
Browse files

rename managers to brokers

parent 386de6d9

.gitlab-ci.yml

+9 −9
Original line number Diff line number Diff line
@@ -7,8 +7,8 @@ stages: 


variables:

  GIT_STRATEGY: clone

  CONTAINER_RDM_URL: "${CI_REGISTRY_IMAGE}/remote-data-manager-dev"

  CONTAINER_RDM_URL_PROD: "${CI_REGISTRY_IMAGE}/remote-data-manager"

  CONTAINER_RDM_URL: "${CI_REGISTRY_IMAGE}/remote-data-broker-dev"

  CONTAINER_RDM_URL_PROD: "${CI_REGISTRY_IMAGE}/remote-data-broker"

  coverage_report_view: "true"



# This import is for the func_rse_docker_* functions
@@ -30,9 +30,9 @@ lint: 
    - >

      docker build

      -f dockerfiles/Dockerfile

      -t remote-data-manager .

      -t remote-data-broker .

    - >

      docker run --rm remote-data-manager bash -c 

      docker run --rm remote-data-broker bash -c 

      "set -e;

      poetry run isort --filter-files --check-only . ;

      poetry run black --check --diff .;
@@ -40,7 +40,7 @@ lint: 
      poetry run pylint app;

      poetry run mypy .

      "

    - docker tag remote-data-manager $CONTAINER_RDM_URL/$CI_COMMIT_REF_NAME:$CI_COMMIT_SHORT_SHA

    - docker tag remote-data-broker $CONTAINER_RDM_URL/$CI_COMMIT_REF_NAME:$CI_COMMIT_SHORT_SHA

    - docker push $CONTAINER_RDM_URL/$CI_COMMIT_REF_NAME:$CI_COMMIT_SHORT_SHA

  tags:

    - rse-multi-builder
@@ -83,8 +83,8 @@ service-build: 
    - >    

      docker build

      -f dockerfiles/Dockerfile --target production

      -t remote-data-manager .

    - docker tag remote-data-manager $CONTAINER_RDM_URL_PROD/$CI_COMMIT_REF_NAME:$CI_COMMIT_SHORT_SHA

      -t remote-data-broker .

    - docker tag remote-data-broker $CONTAINER_RDM_URL_PROD/$CI_COMMIT_REF_NAME:$CI_COMMIT_SHORT_SHA

    - docker tag $CONTAINER_RDM_URL_PROD/$CI_COMMIT_REF_NAME:$CI_COMMIT_SHORT_SHA $CONTAINER_RDM_URL_PROD/$CI_COMMIT_REF_NAME:latest

    - docker push $CONTAINER_RDM_URL_PROD/$CI_COMMIT_REF_NAME:latest

    - docker push $CONTAINER_RDM_URL_PROD/$CI_COMMIT_REF_NAME:$CI_COMMIT_SHORT_SHA
@@ -100,7 +100,7 @@ service-integration-tests: 
  script:

    - > 

      docker run --rm -d

      --name remote-data-manager

      --name remote-data-broker

      -p 8090:8000

      $CONTAINER_RDM_URL_PROD/$CI_COMMIT_REF_NAME:$CI_COMMIT_SHORT_SHA

    - sleep 2
@@ -109,7 +109,7 @@ service-integration-tests: 
      -e LOCALHOST

      -v $PWD:/reports

      $CONTAINER_RDM_URL/$CI_COMMIT_REF_NAME:$CI_COMMIT_SHORT_SHA bash -c "poetry run pytest tests/integration --junitxml=/reports/report_int.xml"

    - docker rm -f remote-data-manager

    - docker rm -f remote-data-broker

  artifacts:

    when: always

    reports:

README.md

+1 −1
Original line number Diff line number Diff line 
# remote-data-managers

# remote-data-brokers



This is a project for remote data managers that are responsible for data transfers between local storage and a distributed data management solution.

app/main.py

+2 −2
Original line number Diff line number Diff line 
"""This is the main app"""

from fastapi import FastAPI



import remote_data_manager

import remote_data_broker

from app.routers import download, upload



app = FastAPI()
@@ -9,4 +9,4 @@ app = FastAPI() 
app.include_router(upload.router)

app.include_router(download.router)



print(remote_data_manager.__version__)
 
print(remote_data_broker.__version__)

pyproject.toml

+1 −1
Original line number Diff line number Diff line 
[tool.poetry]

name = "remote-data-managers"

name = "remote-data-brokers"

version = "0.1.0"

description = ""

authors = ["Yakubov, Sergey <yakubovs@ornl.gov>"]