diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 8f93602976661898863dd63cfa6252eaafd7a28b..604f086ccf620b8ed9b01d98cbdf17972e159f02 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -155,13 +155,6 @@ deploy:amq-message-java-library: - $AMQ_MESSAGE_JAVA_LIBRARY_CLI deploy deploy:prediction_orchestrator: - stage: deploy - image: $DOCKER_DIND_IMAGE - only: - - master - - morphemic-rc1.5 - services: - - $DOCKER_DIND_SERVICE dependencies: - build:prediction_orchestrator script: @@ -170,6 +163,7 @@ deploy:prediction_orchestrator: - docker tag $LOCAL_REPO/morphemic/prediction-orchestrator:latest $CI_REGISTRY_IMAGE/prediction-orchestrator:$CI_COMMIT_BRANCH - docker push $CI_REGISTRY_IMAGE/prediction-orchestrator:$CI_COMMIT_BRANCH + deploy:slo-severity-calculator: stage: deploy image: $DOCKER_DIND_IMAGE @@ -234,3 +228,20 @@ deploy:arima: - echo "$K8S_SECRET_DOCKER_PASSWORD" | docker login $CI_REGISTRY -u $K8S_SECRET_DOCKER_USER --password-stdin - docker tag arima:latest $CI_REGISTRY_IMAGE/arima:$CI_COMMIT_BRANCH - docker push $CI_REGISTRY_IMAGE/arima:$CI_COMMIT_BRANCH + + +deploy:morphemic-forecasting-eshybrid: + stage: deploy + image: $DOCKER_DIND_IMAGE + only: + - master + - morphemic-rc1.5 + services: + - $DOCKER_DIND_SERVICE + script: + - cd morphemic-forecasting-eshybrid + - docker build -t morphemic-forecasting-eshybird . + - docker image ls + - echo "$K8S_SECRET_DOCKER_PASSWORD" | docker login $CI_REGISTRY -u $K8S_SECRET_DOCKER_USER --password-stdin + - docker tag morphemic-forecasting-eshybrid:latest $CI_REGISTRY_IMAGE/morphemic-forecasting-eshybrid:$CI_COMMIT_BRANCH + - docker push $CI_REGISTRY_IMAGE/morphemic-forecasting-eshybrid:$CI_COMMIT_BRANCH diff --git a/morphemic-forecasting-eshybrid/.gitignore b/morphemic-forecasting-eshybrid/.gitignore index 08148e4add67a38533704f4870ccf654bc230889..5dc26144580afa65f35926c37b29ad5304ac5c99 100644 --- a/morphemic-forecasting-eshybrid/.gitignore +++ b/morphemic-forecasting-eshybrid/.gitignore @@ -1,5 +1,3 @@ /local - -sync.cfg sync.cfg.local sync.cfg.production \ No newline at end of file diff --git a/morphemic-forecasting-eshybrid/Dockerfile b/morphemic-forecasting-eshybrid/Dockerfile index 3a1b2edcd1e3f1c5075ac13446d20ab092bb0834..7c211cb99eeadb1a5b3e8db377f0b732051888ea 100644 --- a/morphemic-forecasting-eshybrid/Dockerfile +++ b/morphemic-forecasting-eshybrid/Dockerfile @@ -19,6 +19,7 @@ RUN cd /var/lib/morphemic/ \ WORKDIR /app + RUN pip3 install -r requirements.txt \ && pip3 install -r messaging/requirements.txt diff --git a/morphemic-forecasting-eshybrid/sync.cfg b/morphemic-forecasting-eshybrid/sync.cfg new file mode 100644 index 0000000000000000000000000000000000000000..c563e723896c8420260af9276cc151ab2b595e74 --- /dev/null +++ b/morphemic-forecasting-eshybrid/sync.cfg @@ -0,0 +1,17 @@ +[persistence] +application=default_application +host=147.102.17.76 +port=8086 +username=morphemic +password=password +dbname=morphemic +path_dataset=/tmp/out/dataset-maker + +[messaging] +host=147.102.17.76 +port=61610 +username=aaa +password=111 + +[listener] +id=eshybrid