.gitlab-ci.yml updated v63

.gitlab-ci.yml

@@ -39,22 +39,16 @@ test:
   stage: test
   variables:
     CLEARING_TEST_DIR: "/builds/mfd/clearing/clearing_test"
-    CLR_TEST_DIR: "/builds/mfd/clearing/clr_test"
+    CLR_TEST_DIR: "/builds/mfd/clearing/clr_test/clearing-docker-compose"
+    QEMU_ALPINE_DIR: "/builds/mfd/clearing/clr_test/qemu-alpine"
+    RESULT_FILES_DIR: "/builds/mfd/clearing/clr_test/result-files"
   artifacts:
     name: "$CI_COMMIT_REF_NAME"
     paths:
-      - /builds/mfd/clearing/clr_test/mnt/testFiles
+      - /builds/mfd/clearing/clr_test/result-files
   script:
-    - apk update && apk add maven python3
+    - apk update && apk add maven python3 openssh
     - cd clr_test
-    - pwd
+    - cp -r /builds/mfd/clearing/z-distr/target/clearing/bin ./clearing-docker-compose/clearing-all/bin
-    - cp -r /builds/mfd/clearing/z-distr/target/clearing/bin ./clearing-all/bin
+    - cp /builds/mfd/clearing/z-distr/target/clearing/db/DDL.sql ./clearing-docker-compose/db
-    - cp /builds/mfd/clearing/z-distr/target/clearing/db/DDL.sql ./db
-    - mkdir -p mnt/testFiles
-    - echo "Hello, World" >> mnt/testFiles/1.txt
-    - cat mnt/testFiles/1.txt
     - python3 run_test_docker_containers.py
-    - ls mnt
-    - ls mnt/testFiles
-#    - docker-compose down --volumes
-#    - docker compose up --build --force-recreate --abort-on-container-exit --exit-code-from clearing_system

clr_test/clearing-all/launch_and_test_faketime.sh

@@ -1,6 +0,0 @@
-#!/bin/bash
-
-CLEARING_HOME=/opt/clearing/
-cd $CLEARING_HOME/
-
-LD_PRELOAD=/usr/local/lib/faketime/libfaketime.so.1 FAKETIME_DONT_FAKE_MONOTONIC=1 FAKETIME="@2020-12-24 20:30:00" sh ./launch_and_test.sh

clr_test/clearing-docker-compose/clearing-all/Dockerfile

@@ -10,7 +10,6 @@ ADD ./settings $CLEARING_HOME/settings
 ADD ./kill_all.sh $CLEARING_HOME/kill_all.sh
 ADD ./launch_all.sh $CLEARING_HOME/launch_all.sh
 ADD ./launch_and_test.sh $CLEARING_HOME/launch_and_test.sh
-ADD ./launch_and_test_faketime.sh $CLEARING_HOME/launch_and_test_faketime.sh
 
 ADD ./clearing_testing_utils $CLEARING_HOME/clearing_testing_utils
 
@@ -37,8 +36,4 @@ RUN sed -i 's/\r$//' $CLEARING_HOME/clearing_testing_utils/clearing-checker/*.sh
 RUN sed -i 's/\r$//' $CLEARING_HOME/clearing_testing_utils/clearing-converter/*.sh
 RUN sed -i 's/\r$//' $CLEARING_HOME/clearing_testing_utils/clearing-tester/*.sh
 
-RUN apt update && apt install -y git make libc-dev gcc
+ENTRYPOINT [ "./launch_and_test.sh" ]
-RUN git clone https://github.com/wolfcw/libfaketime.git
-RUN make install -C libfaketime/src/
-
-ENTRYPOINT [ "./launch_and_test_faketime.sh" ]

clr_test/clearing-docker-compose/clearing-all/clearing_testing_utils/clearing-checker/clearing-checker.sh

@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/bin/sh
 
 CLEARING_TEST_HOME=/opt/clearing/clearing_testing_utils/
 cd $CLEARING_TEST_HOME/clearing-checker

clr_test/clearing-docker-compose/clearing-all/clearing_testing_utils/clearing-converter/clearing-converter.sh

@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/bin/sh
 
 CLEARING_TEST_HOME=/opt/clearing/clearing_testing_utils/
 cd $CLEARING_TEST_HOME/clearing-converter

clr_test/clearing-docker-compose/clearing-all/clearing_testing_utils/clearing-tester/clearing-tester.sh

@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/bin/sh
 
 CLEARING_TEST_HOME=/opt/clearing/clearing_testing_utils/
 cd $CLEARING_TEST_HOME/clearing-tester

clr_test/clearing-docker-compose/clearing-all/clearing_testing_utils/run_test_env.sh

@@ -1,5 +1,8 @@
-#!/bin/bash
+#!/bin/sh
+
 cd /opt/clearing/clearing_testing_utils
+
 sh ./clearing-checker/clearing-checker.sh
 sh ./clearing-converter/clearing-converter.sh
+
 echo Test finish. xit code: $?

clr_test/clearing-docker-compose/clearing-all/kill_all.sh

@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/bin/sh
 
 kill -9 $(ps -ef | grep java | grep account-service.jar  | awk '{print $2}')
 kill -9 $(ps -ef | grep java | grep backend-api.jar | awk '{print $2}')

clr_test/clearing-docker-compose/clearing-all/launch_all.sh

@@ -1,12 +1,10 @@
-#!/bin/bash
+#!/bin/sh
 
 CLEARING_HOME=/opt/clearing/
 CLEARING_TEST_HOME=/opt/clearing/clearing_testing_utils/
 cd $CLEARING_HOME/bin
 
 echo Start starting all in $CLEARING_HOME.
-pwd
-ls
 
 java -jar $CLEARING_HOME/bin/imdg.jar --spring.config.location=$CLEARING_HOME/settings/imdg/ &
 java -jar $CLEARING_HOME/bin/backend-api.jar --spring.config.location=$CLEARING_HOME/settings/backend-api/ &
@@ -25,5 +23,3 @@ java -jar $CLEARING_HOME/bin/swt-exporter.jar --spring.config.location=$CLEARING
 java -jar $CLEARING_HOME/bin/swt-importer.jar --spring.config.location=$CLEARING_HOME/settings/swt-importer/ --spring.profiles.active=test &
 #java -jar $CLEARING_TEST_HOME/clearing-tester/clearing-tester.jar --spring.config.location=$CLEARING_TEST_HOME/clearing-tester/ &
 echo all services launched starting. $?
-
-wait -n

clr_test/clearing-docker-compose/clearing-all/launch_and_test.sh

@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/bin/sh
 
 CLEARING_HOME=/opt/clearing/
 cd $CLEARING_HOME/
@@ -7,7 +7,7 @@ date
 
 echo Start CLEARING system
 sh ./launch_all.sh
-sleep 15
+sleep 180
 
 echo Run test case
 sh ./clearing_testing_utils/run_test_env.sh

clr_test/clearing-docker-compose/docker-compose.yml

@@ -86,7 +86,7 @@ volumes:
     driver_opts:
       type: none
       o: bind
-      device: /builds/mfd/clearing/clr_test/mnt/testFiles
+      device: /root/clr_test/mnt/testFiles
   zookeeper_data:
     driver: local
   kafka_data:

clr_test/qemu-alpine/docker-compose.yml

@@ -0,0 +1,17 @@
+services:
+  qemu:
+    container_name: qemu
+    image: qemux/qemu-docker
+    environment:
+      BOOT:
+      RAM_SIZE: "4G"
+    devices:
+      - /dev/kvm
+    cap_add:
+      - NET_ADMIN
+    ports:
+      - 8006:8006
+      - 2222:22
+    stop_grace_period: 2m
+    volumes:
+      - ./mounted:/storage

clr_test/qemu-alpine/mounted/qemu.mac

@@ -0,0 +1 @@
+02:4F:33:36:F2:7A

clr_test/run_test_docker_containers.py

@@ -1,18 +1,31 @@
 import os
 import re
+import time
 import shutil
 import subprocess
 
 
 DATA_ROOT_DIR = os.environ['CLEARING_TEST_DIR']
 CLR_TEST_DIR = os.environ['CLR_TEST_DIR']
+QEMU_ALPINE_DIR = os.environ['QEMU_ALPINE_DIR']
+RESULT_FILES_DIR = os.environ['RESULT_FILES_DIR']
 
 
 def run_docker(folder_name):
     print(f"Running docker-compose for {folder_name}")
-    os.chdir(CLR_TEST_DIR)
+    os.chdir(QEMU_ALPINE_DIR)
-    #subprocess.call("docker compose down --volumes", shell=True)
+    subprocess.call('docker compose up -d', shell=True)
-    subprocess.call('docker compose up -V --build --abort-on-container-exit --exit-code-from clearing_system', shell=True)
+    time.sleep(3)
+    subprocess.call('scp -P 2222 -r ../clearing-docker-compose root@localhost:/root/clr_test', shell=True)
+    subprocess.call('ssh root@localhost -p 2222', shell=True)
+    subprocess.call('cd clr_test', shell=True)
+    subprocess.call('docker compose pull', shell=True)
+    subprocess.call('docker compose build', shell=True)
+    subprocess.call('date --set "2020-01-01 00:00:00"', shell=True)
+    subprocess.call('docker compose up', shell=True)
+    subprocess.call('exit', shell=True)
+    subprocess.call("scp -P 2222 -r root@localhost:/root/clr_test/mnt/testFiles {RESULT_FILES_DIR}", shell=True)
+    os.remove(f"{QEMU_ALPINE_DIR}/mounted/data.qcow2")
     os.chdir("..")
 
 
@@ -24,6 +37,7 @@ def main():
     os.remove(f"{CLR_TEST_DIR}/db/test-data.sql")
     shutil.copytree(f"{DATA_ROOT_DIR}/{folders[0]}/db/", f"{CLR_TEST_DIR}/db/", dirs_exist_ok=True)
     shutil.copytree(f"{DATA_ROOT_DIR}/{folders[0]}/clearing_testing_utils/", f"{CLR_TEST_DIR}/clearing-all/clearing_testing_utils/", dirs_exist_ok=True)
+    shutil.copy2(f"{QEMU_ALPINE_DIR}/data.qcow2", f"{QEMU_ALPINE_DIR}/mounted")
     run_docker(folders[0])
     # for folder in folders:
     #     shutil.rmtree(f"{CLR_TEST_DIR}/clearing-all/clearing_testing_utils/store")