Commit cbff1988 authored by mriedl's avatar mriedl
Browse files

Merge remote-tracking branch 'remotes/origin/morphemic-rc2.0' into branchSychronization

# Conflicts:
#	deployment/arima/main.py
#	deployment/arima/src/model_predict.py
#	deployment/arima/src/preprocess_dataset.py
#	deployment/arima/test/model_predict_test.py
#	deployment/arima/test/preprocess_dataset_test.py
#	deployment/nbeats/main.py
#	deployment/nbeats/predict.py
#	deployment/nbeats/src/model_predict.py
#	deployment/nbeats/src/model_train.py
#	deployment/nbeats/src/preprocess_dataset.py
#	deployment/nbeats/test/model_predict_test.py
#	deployment/nbeats/test/preprocess_dataset_test.py
#	deployment/tft/main.py
#	deployment/tft/predict.py
#	deployment/tft/retrain.py
#	deployment/tft/src/model_predict.py
#	deployment/tft/src/model_train.py
#	deployment/tft/src/preprocess_dataset.py
#	deployment/tft/test/model_predict_test.py
#	deployment/tft/test/preprocess_dataset_test.py
#	morphemic-forecasting-eshybrid/Dockerfile
#	morphemic-forecasting-eshybrid/main.py
#	scheduling-abstraction-layer/build.gradle
#	scheduling-abstraction-layer/pom.xml
parents f73803f6 3e227003
Pipeline #17258 passed with stage
in 1 minute and 47 seconds
......@@ -56,6 +56,8 @@ build:amq-message-java-library:
only:
- master
- morphemic-rc1.5
- morphemic-rc2.0
script:
- $AMQ_MESSAGE_JAVA_LIBRARY_CLI clean install
artifacts:
......@@ -69,6 +71,7 @@ build:prediction_orchestrator:
only:
- master
- morphemic-rc1.5
- morphemic-rc2.0
script:
- $PREDICTON_ORCHESTRATOR_CLI -Pwithout-docker clean install
artifacts:
......@@ -82,6 +85,7 @@ build:slo-severity-calculator:
only:
- master
- morphemic-rc1.5
- morphemic-rc2.0
script:
- $SLO_SEVERITY_CALCULATOR_CLI -Dtest=!UnboundedMonitoringAttributeTests,!ConnectivityTests clean install
artifacts:
......@@ -95,6 +99,7 @@ deploy:performance-model:
only:
- master
- morphemic-rc1.5
- morphemic-rc2.0
services:
- $DOCKER_DIND_SERVICE
script:
......@@ -111,6 +116,7 @@ deploy:persistent-storage:
only:
- master
- morphemic-rc1.5
- morphemic-rc2.0
services:
- $DOCKER_DIND_SERVICE
script:
......@@ -127,6 +133,7 @@ deploy:forecaster-cnn:
only:
- master
- morphemic-rc1.5
- morphemic-rc2.0
services:
- $DOCKER_DIND_SERVICE
script:
......@@ -143,6 +150,7 @@ deploy:scheduling-abstraction-layer:
only:
- master
- morphemic-rc1.5
- morphemic-rc2.0
- proactive-dev
dependencies:
- build:scheduling-abstraction-layer
......@@ -155,6 +163,7 @@ deploy:amq-message-java-library:
only:
- master
- morphemic-rc1.5
- morphemic-rc2.0
dependencies:
- build:amq-message-java-library
script:
......@@ -166,6 +175,7 @@ deploy:prediction_orchestrator:
only:
- master
- morphemic-rc1.5
- morphemic-rc2.0
services:
- $DOCKER_DIND_SERVICE
dependencies:
......@@ -182,6 +192,7 @@ deploy:slo-severity-calculator:
only:
- master
- morphemic-rc1.5
- morphemic-rc2.0
dependencies:
- build:slo-severity-calculator
services:
......@@ -202,6 +213,7 @@ deploy:nbeats:
only:
- master
- morphemic-rc1.5
- morphemic-rc2.0
services:
- $DOCKER_DIND_SERVICE
script:
......@@ -217,6 +229,7 @@ deploy:tft:
only:
- master
- morphemic-rc1.5
- morphemic-rc2.0
services:
- $DOCKER_DIND_SERVICE
script:
......@@ -232,6 +245,7 @@ deploy:arima:
only:
- master
- morphemic-rc1.5
- morphemic-rc2.0
services:
- $DOCKER_DIND_SERVICE
script:
......@@ -247,6 +261,7 @@ deploy:morphemic-forecasting-eshybrid:
only:
- master
- morphemic-rc1.5
- morphemic-rc2.0
services:
- $DOCKER_DIND_SERVICE
script:
......
......@@ -19,7 +19,7 @@
<artifactId>amq-message-java-library</artifactId>
<name>AMQ message Java library</name>
<groupId>gr.ntua.imu.morphemic</groupId>
<version>1.1.2-SNAPSHOT</version>
<version>2.0.0-SNAPSHOT</version>
<dependencies>
......
......@@ -6,17 +6,17 @@ WORKDIR /wd
COPY deployment/arima/requirements.txt .
RUN pip3 install --no-cache-dir -r requirements.txt && mkdir models
ADD https://gitlab.ow2.org/melodic/morphemic-preprocessor/-/archive/morphemic-rc1.5/morphemic-preprocessor-morphemic-rc1.5.tar.gz /var/lib/morphemic/
ADD https://gitlab.ow2.org/melodic/morphemic-preprocessor/-/archive/morphemic-rc2.0/morphemic-preprocessor-morphemic-rc2.0.tar.gz /var/lib/morphemic/
# Copy the rest of the codebase into the image
COPY deployment/arima ./
RUN cd /var/lib/morphemic/ \
&& tar -zxf morphemic-preprocessor-morphemic-rc1.5.tar.gz \
&& cd morphemic-preprocessor-morphemic-rc1.5 \
&& tar -zxf morphemic-preprocessor-morphemic-rc2.0.tar.gz \
&& cd morphemic-preprocessor-morphemic-rc2.0 \
&& cd morphemic-datasetmaker && python3 setup.py install \
&& cd ../.. \
&& cp -R /var/lib/morphemic/morphemic-preprocessor-morphemic-rc1.5/amq-message-python-library /wd/amq_message_python_library \
&& cp -R /var/lib/morphemic/morphemic-preprocessor-morphemic-rc2.0/amq-message-python-library /wd/amq_message_python_library \
&& rm -rf /var/lib/morphemic
CMD ["python3", "main.py"]
......
def square(x):
return x * x
\ No newline at end of file
......@@ -6,17 +6,17 @@ WORKDIR /wd
COPY deployment/nbeats/requirements.txt .
RUN pip3 install --no-cache-dir -r requirements.txt && mkdir models
ADD https://gitlab.ow2.org/melodic/morphemic-preprocessor/-/archive/morphemic-rc1.5/morphemic-preprocessor-morphemic-rc1.5.tar.gz /var/lib/morphemic/
ADD https://gitlab.ow2.org/melodic/morphemic-preprocessor/-/archive/morphemic-rc2.0/morphemic-preprocessor-morphemic-rc2.0.tar.gz /var/lib/morphemic/
# Copy the rest of the codebase into the image
COPY deployment/nbeats/ ./
RUN cd /var/lib/morphemic/ \
&& tar -zxf morphemic-preprocessor-morphemic-rc1.5.tar.gz \
&& cd morphemic-preprocessor-morphemic-rc1.5 \
&& tar -zxf morphemic-preprocessor-morphemic-rc2.0.tar.gz \
&& cd morphemic-preprocessor-morphemic-rc2.0 \
&& cd morphemic-datasetmaker && python3 setup.py install \
&& cd ../.. \
&& cp -R /var/lib/morphemic/morphemic-preprocessor-morphemic-rc1.5/amq-message-python-library /wd/amq_message_python_library \
&& cp -R /var/lib/morphemic/morphemic-preprocessor-morphemic-rc2.0/amq-message-python-library /wd/amq_message_python_library \
&& rm -rf /var/lib/morphemic \
&& mkdir -p /wd/logs
......
......@@ -6,17 +6,17 @@ WORKDIR /wd
COPY deployment/tft/requirements.txt .
RUN pip3 install --no-cache-dir -r requirements.txt && mkdir models
ADD https://gitlab.ow2.org/melodic/morphemic-preprocessor/-/archive/morphemic-rc1.5/morphemic-preprocessor-morphemic-rc1.5.tar.gz /var/lib/morphemic/
ADD https://gitlab.ow2.org/melodic/morphemic-preprocessor/-/archive/morphemic-rc2.0/morphemic-preprocessor-morphemic-rc2.0.tar.gz /var/lib/morphemic/
# Copy the rest of the codebase into the image
COPY deployment/tft/ ./
RUN cd /var/lib/morphemic/ \
&& tar -zxf morphemic-preprocessor-morphemic-rc1.5.tar.gz \
&& cd morphemic-preprocessor-morphemic-rc1.5 \
&& tar -zxf morphemic-preprocessor-morphemic-rc2.0.tar.gz \
&& cd morphemic-preprocessor-morphemic-rc2.0 \
&& cd morphemic-datasetmaker && python3 setup.py install \
&& cd ../.. \
&& cp -R /var/lib/morphemic/morphemic-preprocessor-morphemic-rc1.5/amq-message-python-library /wd/amq_message_python_library \
&& cp -R /var/lib/morphemic/morphemic-preprocessor-morphemic-rc2.0/amq-message-python-library /wd/amq_message_python_library \
&& rm -rf /var/lib/morphemic \
&& mkdir -p /wd/logs
......
......@@ -18,12 +18,12 @@ RUN apt-get update && apt-get install -y \
COPY . /app
ADD https://gitlab.ow2.org/melodic/morphemic-preprocessor/-/archive/morphemic-rc1.5/morphemic-preprocessor-morphemic-rc1.5.tar.gz /var/lib/morphemic/
ADD https://gitlab.ow2.org/melodic/morphemic-preprocessor/-/archive/morphemic-rc2.0/morphemic-preprocessor-morphemic-rc2.0.tar.gz /var/lib/morphemic/
RUN cd /var/lib/morphemic/ \
&& tar -zxf morphemic-preprocessor-morphemic-rc1.5.tar.gz \
&& tar -zxf morphemic-preprocessor-morphemic-rc2.0.tar.gz \
&& rm -rf /app/messaging \
&& cp -R /var/lib/morphemic/morphemic-preprocessor-morphemic-rc1.5/amq-message-python-library /app/messaging \
&& cp -R /var/lib/morphemic/morphemic-preprocessor-morphemic-rc2.0/amq-message-python-library /app/messaging \
&& rm -rf /var/lib/morphemic
COPY docker-entrypoint.sh /app
......
......@@ -10,7 +10,7 @@
</parent>
<groupId>eu.morphemic</groupId>
<artifactId>prediction_orchestrator</artifactId>
<version>0.0.1-SNAPSHOT</version>
<version>1.0.0-SNAPSHOT</version>
<name>prediction_orchestrator</name>
<description>project for Spring Boot</description>
<properties>
......@@ -80,7 +80,7 @@
<dependency>
<groupId>gr.ntua.imu.morphemic</groupId>
<artifactId>amq-message-java-library</artifactId>
<version>1.1.2-SNAPSHOT</version>
<version>2.0.0-SNAPSHOT</version>
</dependency>
<dependency>
......
FROM openjdk:11
VOLUME /tmp
ADD prediction_orchestrator-0.0.1-SNAPSHOT.jar prediction_orchestrator-0.0.1-SNAPSHOT.jar
ADD prediction_orchestrator-1.0.0-SNAPSHOT.jar prediction_orchestrator-1.0.0-SNAPSHOT.jar
COPY ./run.sh .
RUN bash -c 'chmod +rx run.sh'
ENTRYPOINT ["./run.sh"]
......
#!/bin/sh
java -Djavax.net.ssl.trustStore=/config/common/melodic-truststore.p12 -Djavax.net.ssl.trustStorePassword=melodic -Djavax.net.ssl.trustStoreType=pkcs12 -XX:ErrorFile=/logs/java_error%p.log -XX:HeapDumpPath=/logs -Duser.timezone=Europe/Warsaw -Djava.security.egd=file:/dev/./urandom -agentlib:jdwp=transport=dt_socket,server=y,suspend=n,address=5005 -jar prediction_orchestrator-0.0.1-SNAPSHOT.jar
java -Djavax.net.ssl.trustStore=/config/common/melodic-truststore.p12 -Djavax.net.ssl.trustStorePassword=melodic -Djavax.net.ssl.trustStoreType=pkcs12 -XX:ErrorFile=/logs/java_error%p.log -XX:HeapDumpPath=/logs -Duser.timezone=Europe/Warsaw -Djava.security.egd=file:/dev/./urandom -agentlib:jdwp=transport=dt_socket,server=y,suspend=n,address=5005 -jar prediction_orchestrator-1.0.0-SNAPSHOT.jar
......@@ -3,7 +3,7 @@ plugins {
}
group 'org.activeeon'
version '3.7-SNAPSHOT'
version '4.0-SNAPSHOT'
sourceCompatibility = 1.8
......
......@@ -4,7 +4,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>org.activeeon</groupId>
<artifactId>scheduling-abstraction-layer</artifactId>
<version>3.7-SNAPSHOT</version>
<version>4.0-SNAPSHOT</version>
<dependencies>
<dependency>
<groupId>org.projectlombok</groupId>
......
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