.gitlab-ci.yml updated v29

.gitlab-ci.yml

@@ -5,16 +5,32 @@ image:
 variables:
   GIT_SUBMODULE_STRATEGY: recursive
   DOCKER_PROXY: "mirror.gcr.io"
+  ACCESS_TOKEN: "glpat-HaKhVbzw6xfQBbXHT6tR"
 
 stages:
+  - preflight
   - build
   - test
 
+preflight:
+  image: ${DOCKER_PROXY}/bitnami/git:latest
+  stage: preflight
+  script:
+    - pwd
+    - git clone -b dev 'http://gitlab-ci-token:${ACCESS_TOKEN}@git.mfd.msk/mfd/clearing_test.git'
+  artifacts:
+    name: "$CI_COMMIT_REF_NAME"
+    expire_in: 1 day
+    paths:
+      - clearing_test
+
 build:
   image: ${DOCKER_PROXY}/maven:latest
   stage: build
   script:
     - mvn clean package -DskipTests -Pdistributive
+    - cd /builds/mfd/clearing/clearing_test
+    - ls -la
 #    - mvn --version
   artifacts:
     name: "$CI_COMMIT_REF_NAME"
@@ -29,6 +45,6 @@ test:
     - pwd
     - cp -r /builds/mfd/clearing/z-distr/target/clearing/bin ./clearing-all/bin
     - cp -r /builds/mfd/clearing/z-distr/target/clearing/settings ./clearing-all/settings
-    - cp /builds/mfd/clearing/z-distr/target/clearing/db/DDL.sql ./clearing-all/db
+    - cp /builds/mfd/clearing/z-distr/target/clearing/db/DDL.sql ./db
     - docker-compose down --volumes
     - docker compose up --build --force-recreate --abort-on-container-exit --exit-code-from clearing_system

clr_test/clean_all.sh

@@ -1,3 +0,0 @@
-#!/bin/bash
-docker rm -v $(docker ps --filter status=exited -q)
-docker rmi -f $(docker images -aq)

clr_test/clearing-all/Dockerfile

@@ -15,9 +15,6 @@ ADD ./clearing_testing_utils $CLEARING_HOME/clearing_testing_utils
 
 USER root
 
-#RUN apt-get update && apt-get install -y nano
-#RUN apt update && apt install -y less procps
-
 RUN chmod +x $CLEARING_HOME/*.sh
 RUN chmod +x $CLEARING_HOME/clearing_testing_utils/*.sh
 RUN chmod +x $CLEARING_HOME/clearing_testing_utils/clearing-checker/*.sh
@@ -33,12 +30,5 @@ RUN mkdir -p $CLEARING_HOME/files/dbf/importer/error
 RUN mkdir -p $CLEARING_HOME/files/dbf/exporter
 
 WORKDIR $CLEARING_HOME
-RUN sed -i 's/\r$//' launch_all.sh
 RUN sed -i 's/\r$//' launch_and_test.sh
-#CMD ./launch_all.sh
-#CMD ./clearing_testing_utils/run_test_env.sh
-#ENTRYPOINT [ "./clearing_testing_utils/clearing-tester/clearing-tester.sh" ] <---- по завершению этого скрипта dockerCompose должен завершиться.
-#ENTRYPOINT [ "./launch_all.sh" ]
 ENTRYPOINT [ "./launch_and_test.sh" ]
-# ENTRYPOINT ["tail", "-f", "/dev/null"]
-#CMD ["$CLEARING_HOME/clearing_testing_utils/run_test_all.sh"]

clr_test/clearing-all/db/Dockerfile

@@ -1,5 +0,0 @@
-FROM mirror.gcr.io/postgres:14.1-alpine
-
-ADD ./DDL.sql /docker-entrypoint-initdb.d/
-ADD ./export.sql /docker-entrypoint-initdb.d/
-ADD ./test-data.sql /docker-entrypoint-initdb.d/

clr_test/db/Dockerfile

@@ -0,0 +1,5 @@
+FROM mirror.gcr.io/postgres:14.1-alpine
+
+ADD ./DDL.sql /docker-entrypoint-initdb.d/
+ADD export.sql /docker-entrypoint-initdb.d/
+ADD test-data.sql /docker-entrypoint-initdb.d/

clr_test/docker-compose.yml

@@ -1,7 +1,7 @@
 version: "3"
 services:
   db:
-    build: ./clearing-all/db
+    build: db
     restart: always
     environment:
       - POSTGRES_USER=clearing

clr_test/init-user-db.sh

@@ -1,8 +0,0 @@
-#!/bin/bash
-set -e
-
-psql -v ON_ERROR_STOP=1 --username "$POSTGRES_USER" --dbname "$POSTGRES_DB" <<-EOSQL
-	CREATE USER clr_test;
-	CREATE DATABASE clr_test;
-	GRANT ALL PRIVILEGES ON DATABASE clr_test TO clr_test;
-EOSQL

clr_test/pg_hba.conf

@@ -1,95 +0,0 @@
-# PostgreSQL Client Authentication Configuration File
-# ===================================================
-#
-# Refer to the "Client Authentication" section in the PostgreSQL
-# documentation for a complete description of this file.  A short
-# synopsis follows.
-#
-# This file controls: which hosts are allowed to connect, how clients
-# are authenticated, which PostgreSQL user names they can use, which
-# databases they can access.  Records take one of these forms:
-#
-# local         DATABASE  USER  METHOD  [OPTIONS]
-# host          DATABASE  USER  ADDRESS  METHOD  [OPTIONS]
-# hostssl       DATABASE  USER  ADDRESS  METHOD  [OPTIONS]
-# hostnossl     DATABASE  USER  ADDRESS  METHOD  [OPTIONS]
-# hostgssenc    DATABASE  USER  ADDRESS  METHOD  [OPTIONS]
-# hostnogssenc  DATABASE  USER  ADDRESS  METHOD  [OPTIONS]
-#
-# (The uppercase items must be replaced by actual values.)
-#
-# The first field is the connection type:
-# - "local" is a Unix-domain socket
-# - "host" is a TCP/IP socket (encrypted or not)
-# - "hostssl" is a TCP/IP socket that is SSL-encrypted
-# - "hostnossl" is a TCP/IP socket that is not SSL-encrypted
-# - "hostgssenc" is a TCP/IP socket that is GSSAPI-encrypted
-# - "hostnogssenc" is a TCP/IP socket that is not GSSAPI-encrypted
-#
-# DATABASE can be "all", "sameuser", "samerole", "replication", a
-# database name, or a comma-separated list thereof. The "all"
-# keyword does not match "replication". Access to replication
-# must be enabled in a separate record (see example below).
-#
-# USER can be "all", a user name, a group name prefixed with "+", or a
-# comma-separated list thereof.  In both the DATABASE and USER fields
-# you can also write a file name prefixed with "@" to include names
-# from a separate file.
-#
-# ADDRESS specifies the set of hosts the record matches.  It can be a
-# host name, or it is made up of an IP address and a CIDR mask that is
-# an integer (between 0 and 32 (IPv4) or 128 (IPv6) inclusive) that
-# specifies the number of significant bits in the mask.  A host name
-# that starts with a dot (.) matches a suffix of the actual host name.
-# Alternatively, you can write an IP address and netmask in separate
-# columns to specify the set of hosts.  Instead of a CIDR-address, you
-# can write "samehost" to match any of the server's own IP addresses,
-# or "samenet" to match any address in any subnet that the server is
-# directly connected to.
-#
-# METHOD can be "trust", "reject", "md5", "password", "scram-sha-256",
-# "gss", "sspi", "ident", "peer", "pam", "ldap", "radius" or "cert".
-# Note that "password" sends passwords in clear text; "md5" or
-# "scram-sha-256" are preferred since they send encrypted passwords.
-#
-# OPTIONS are a set of options for the authentication in the format
-# NAME=VALUE.  The available options depend on the different
-# authentication methods -- refer to the "Client Authentication"
-# section in the documentation for a list of which options are
-# available for which authentication methods.
-#
-# Database and user names containing spaces, commas, quotes and other
-# special characters must be quoted.  Quoting one of the keywords
-# "all", "sameuser", "samerole" or "replication" makes the name lose
-# its special character, and just match a database or username with
-# that name.
-#
-# This file is read on server startup and when the server receives a
-# SIGHUP signal.  If you edit the file on a running system, you have to
-# SIGHUP the server for the changes to take effect, run "pg_ctl reload",
-# or execute "SELECT pg_reload_conf()".
-#
-# Put your actual configuration here
-# ----------------------------------
-#
-# If you want to allow non-local connections, you need to add more
-# "host" records.  In that case you will also need to make PostgreSQL
-# listen on a non-local interface via the listen_addresses
-# configuration parameter, or via the -i or -h command line switches.
-
-
-
-# TYPE  DATABASE        USER            ADDRESS                 METHOD
-
-# "local" is for Unix domain socket connections only
-local   all             all                                     peer
-# IPv4 local connections: last value 127.0.0.1/32
-#host    all             all             0.0.0.0/0            scram-sha-256
-host    all             all             0.0.0.0/0            trust
-# IPv6 local connections:
-host    all             all             ::1/128                 trust
-# Allow replication connections from localhost, by a user with the
-# replication privilege.
-local   replication     all                                     peer
-host    replication     all             127.0.0.1/32            scram-sha-256
-host    replication     all             ::1/128                 scram-sha-256

clr_test/run.sh

@@ -1,3 +0,0 @@
-#!/bin/bash
-
-docker compose up --abort-on-container-exit --exit-code-from clearing_system