From ab106859d822ff8e5631592e60945787460ef9d4 Mon Sep 17 00:00:00 2001
From: Fotis Paraskevopoulos <fotis@existanze.com>
Date: Tue, 14 Sep 2021 09:56:27 +0300
Subject: [PATCH 1/4] MOR-104 adding sync.cfg and deployment to CI

---
 .gitlab-ci.yml                            | 16 ++++++++++++++++
 morphemic-forecasting-eshybrid/.gitignore |  2 --
 morphemic-forecasting-eshybrid/Dockerfile |  1 +
 morphemic-forecasting-eshybrid/sync.cfg   | 17 +++++++++++++++++
 4 files changed, 34 insertions(+), 2 deletions(-)
 create mode 100644 morphemic-forecasting-eshybrid/sync.cfg

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 05576661..43c2d57a 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -88,3 +88,19 @@ deploy:amq-message-java-library:
     - build:amq-message-java-library
   script:
     - $AMQ_MESSAGE_JAVA_LIBRARY_CLI deploy
+
+deploy:forecasting-eshybird:
+  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
\ No newline at end of file
diff --git a/morphemic-forecasting-eshybrid/.gitignore b/morphemic-forecasting-eshybrid/.gitignore
index 08148e4a..5dc26144 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 3a1b2edc..7c211cb9 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 00000000..c563e723
--- /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
-- 
GitLab


From e446fdaff238e5f3f48b8ac791d4b5851ad4011b Mon Sep 17 00:00:00 2001
From: Fotis Paraskevopoulos <fotis@existanze.com>
Date: Tue, 14 Sep 2021 09:56:49 +0300
Subject: [PATCH 2/4] MOR-104 adding sync.cfg and deployment to CI

---
 .gitlab-ci.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 43c2d57a..1d9b52b1 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -89,7 +89,7 @@ deploy:amq-message-java-library:
   script:
     - $AMQ_MESSAGE_JAVA_LIBRARY_CLI deploy
 
-deploy:forecasting-eshybird:
+deploy:morphemic-forecasting-eshybrid:
   stage: deploy
   image: $DOCKER_DIND_IMAGE
   only:
-- 
GitLab


From 9ef86e63ea39ccc6989584aeac4fb62f4ebbe910 Mon Sep 17 00:00:00 2001
From: Fotis Paraskevopoulos <fotis@existanze.com>
Date: Tue, 14 Sep 2021 10:03:24 +0300
Subject: [PATCH 3/4] Failed pipeline

---
 .gitlab-ci.yml | 1 -
 1 file changed, 1 deletion(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 59ba08ad..604f086c 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -245,4 +245,3 @@ deploy:morphemic-forecasting-eshybrid:
     - 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
-    -
\ No newline at end of file
-- 
GitLab


From ddf5379d211550488ee7a34ce5f2c9e3525612c7 Mon Sep 17 00:00:00 2001
From: Fotis Paraskevopoulos <fotis@existanze.com>
Date: Tue, 14 Sep 2021 10:04:57 +0300
Subject: [PATCH 4/4] Failed pipeline

---
 .gitlab-ci.yml | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 604f086c..8b20a9b7 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -155,6 +155,13 @@ 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:
@@ -163,7 +170,6 @@ 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
@@ -213,7 +219,7 @@ deploy:tft:
     - echo "$K8S_SECRET_DOCKER_PASSWORD" | docker login $CI_REGISTRY -u $K8S_SECRET_DOCKER_USER --password-stdin
     - docker tag tft:latest $CI_REGISTRY_IMAGE/tft:$CI_COMMIT_BRANCH
     - docker push $CI_REGISTRY_IMAGE/tft:$CI_COMMIT_BRANCH
-    
+
 deploy:arima:
   stage: deploy
   image: $DOCKER_DIND_IMAGE
@@ -229,7 +235,6 @@ deploy:arima:
     - 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
-- 
GitLab