Commit f28b374e authored by Ignacio's avatar Ignacio
Browse files

Añade variable para definir intervalo de partición

parent b0e5408f

.gitlab-ci.yml

+7 −3
Original line number Diff line number Diff line
@@ -83,11 +83,12 @@ deploy-dev: 
    COMPOSE_FILE: docker-compose.postgresql.tmpl.yml:docker-compose.postgresql.dev.yml

    POSTGRES_USER: ${POSTGRES_USER}

    POSTGRES_PASSWORD: ${POSTGRES_PASSWORD}

    INTERVAL: ${INTERVAL}

  script:

    - create-nets.sh postgres-net

    - >

      deploy.sh IMAGE_NAME=${IMAGE_NAME} IMAGE_TAG=${IMAGE_TAG} COMPOSE_FILE=${COMPOSE_FILE}

      POSTGRES_USER=${POSTGRES_USER} POSTGRES_PASSWORD=${POSTGRES_PASSWORD}

      POSTGRES_USER=${POSTGRES_USER} POSTGRES_PASSWORD=${POSTGRES_PASSWORD} INTERVAL=${INTERVAL}

  environment:

    name: dev/postgresql

  only:
@@ -108,11 +109,12 @@ deploy-supporting-branch: 
    COMPOSE_FILE: docker-compose.postgresql.tmpl.yml:docker-compose.postgresql.dev.yml

    POSTGRES_USER: ${POSTGRES_USER}

    POSTGRES_PASSWORD: ${POSTGRES_PASSWORD}

    INTERVAL: ${INTERVAL}

  script:

    - create-nets.sh postgres-net

    - >

      deploy.sh IMAGE_NAME=${IMAGE_NAME} IMAGE_TAG=${IMAGE_TAG} COMPOSE_FILE=${COMPOSE_FILE}

      POSTGRES_USER=${POSTGRES_USER} POSTGRES_PASSWORD=${POSTGRES_PASSWORD}

      POSTGRES_USER=${POSTGRES_USER} POSTGRES_PASSWORD=${POSTGRES_PASSWORD} INTERVAL=${INTERVAL}

  environment:

    name: dev/postgresql

  only:
@@ -135,12 +137,14 @@ deploy-pro: 
    COMPOSE_FILE: docker-compose.postgresql.tmpl.yml:docker-compose.postgresql.prod.yml

    POSTGRES_USER: ${POSTGRES_USER}

    POSTGRES_PASSWORD: ${POSTGRES_PASSWORD}

    INTERVAL: ${INTERVAL}

    AWS_REGION: ${AWS_REGION}

  script:

    - create-nets.sh postgres-net

    - >

      deploy.sh IMAGE_NAME=${IMAGE_NAME} IMAGE_TAG=${IMAGE_TAG} COMPOSE_FILE=${COMPOSE_FILE}

      POSTGRES_USER=${POSTGRES_USER} POSTGRES_PASSWORD=${POSTGRES_PASSWORD} AWS_REGION=${AWS_REGION}

      POSTGRES_USER=${POSTGRES_USER} POSTGRES_PASSWORD=${POSTGRES_PASSWORD} INTERVAL=${INTERVAL}

      AWS_REGION=${AWS_REGION}

  environment:

    name: pro/postgresql

  only:

deploy/.env

+1 −0
Original line number Diff line number Diff line 
POSTGRES_DB=ais

PGDATA=/var/lib/postgresql/data/db-files/

DESIRED_WORKER_AZ=b

INTERVAL=daily

deploy/docker-compose.postgresql.tmpl.yml

+1 −0
Original line number Diff line number Diff line
@@ -8,6 +8,7 @@ services: 
      - POSTGRES_USER

      - POSTGRES_DB

      - PGDATA

      - INTERVAL

    networks:

      postgres-net:

        aliases:

scripts/vessel.sh

+2 −2
Original line number Diff line number Diff line
@@ -55,7 +55,7 @@ psql -v ON_ERROR_STOP=1 --username "$POSTGRES_USER" --dbname "$POSTGRES_DB" <<-E 
	  ON ais.location_parent

	  USING gist (shape);



	SELECT partman.create_parent('ais.location_parent', 'tstamp', 'native', 'hourly');

	SELECT partman.create_parent('ais.location_parent', 'tstamp', 'native', '${INTERVAL}');

	UPDATE partman.part_config SET infinite_time_partitions = true;



	-- View
@@ -90,6 +90,6 @@ psql -v ON_ERROR_STOP=1 --username "$POSTGRES_USER" --dbname "$POSTGRES_DB" <<-E 
		ON ais.location

		FOR EACH ROW EXECUTE PROCEDURE ais.create_shape();



	SELECT cron.schedule('@hourly', \$\$SELECT partman.run_maintenance_proc(p_analyze := false)\$\$)

	SELECT cron.schedule('@${INTERVAL}', \$\$SELECT partman.run_maintenance_proc(p_analyze := false)\$\$)



EOSQL
 
 No newline at end of file