Skip to content

Commit 4457dc1

Browse files
committed
Merge branch 'remove-envs-for-promotion' into 'master'
fix: remove pg_basebackup envs for promotion See merge request postgres-ai/database-lab!617
2 parents d1707ab + 6e79ec4 commit 4457dc1

File tree

6 files changed

+6
-14
lines changed

6 files changed

+6
-14
lines changed

engine/configs/config.example.physical_generic.yml

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -293,12 +293,8 @@ retrieval:
293293
# Limit defines how many snapshots should be hold.
294294
limit: 4
295295

296-
# Set environment variables here. See https://www.postgresql.org/docs/current/libpq-envars.html
296+
# Passes custom environment variables to the promotion Docker container.
297297
envs:
298-
PGUSER: "postgres"
299-
PGPASSWORD: "postgres"
300-
PGHOST: "source.hostname"
301-
PGPORT: 5432
302298

303299
cloning:
304300
# Host that will be specified in database connection info for all clones

engine/test/1.synthetic.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,7 @@ metaDir="$HOME/.dblab/engine/meta"
7474
# Copy the contents of configuration example
7575
mkdir -p "${configDir}"
7676

77-
curl https://gitlab.com/postgres-ai/database-lab/-/raw/"${CI_COMMIT_BRANCH:-master}"/engine/configs/config.example.logical_generic.yml \
77+
curl https://gitlab.com/postgres-ai/database-lab/-/raw/"${TAG:-master}"/engine/configs/config.example.logical_generic.yml \
7878
--output "${configDir}/server.yml"
7979

8080
# Edit the following options

engine/test/2.logical_generic.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -84,7 +84,7 @@ metaDir="$HOME/.dblab/engine/meta"
8484
mkdir -p "${configDir}"
8585
mkdir -p "${metaDir}"
8686

87-
curl https://gitlab.com/postgres-ai/database-lab/-/raw/"${CI_COMMIT_BRANCH:-master}"/engine/configs/config.example.logical_generic.yml \
87+
curl https://gitlab.com/postgres-ai/database-lab/-/raw/"${TAG:-master}"/engine/configs/config.example.logical_generic.yml \
8888
--output "${configDir}/server.yml"
8989

9090
# Edit the following options

engine/test/3.physical_walg.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ metaDir="$HOME/.dblab/engine/meta"
4040
# Copy the contents of configuration example
4141
mkdir -p "${configDir}"
4242

43-
curl https://gitlab.com/postgres-ai/database-lab/-/raw/"${CI_COMMIT_BRANCH:-master}"/engine/configs/config.example.physical_walg.yml \
43+
curl https://gitlab.com/postgres-ai/database-lab/-/raw/"${TAG:-master}"/engine/configs/config.example.physical_walg.yml \
4444
--output "${configDir}/server.yml"
4545

4646
# Edit the following options

engine/test/4.physical_basebackup.sh

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -98,7 +98,7 @@ metaDir="$HOME/.dblab/engine/meta"
9898
# Copy the contents of configuration example
9999
mkdir -p "${configDir}"
100100

101-
curl https://gitlab.com/postgres-ai/database-lab/-/raw/"${CI_COMMIT_BRANCH:-master}"/engine/configs/config.example.physical_generic.yml \
101+
curl https://gitlab.com/postgres-ai/database-lab/-/raw/"${TAG:-master}"/engine/configs/config.example.physical_generic.yml \
102102
--output "${configDir}/server.yml"
103103

104104
# Edit the following options
@@ -115,10 +115,6 @@ yq eval -i '
115115
.retrieval.spec.physicalRestore.options.envs.PGPASSWORD = strenv(SOURCE_PASSWORD) |
116116
.retrieval.spec.physicalRestore.options.envs.PGHOST = strenv(SOURCE_HOST) |
117117
.retrieval.spec.physicalRestore.options.envs.PGPORT = env(SOURCE_PORT) |
118-
.retrieval.spec.physicalSnapshot.options.envs.PGUSER = strenv(SOURCE_USERNAME) |
119-
.retrieval.spec.physicalSnapshot.options.envs.PGPASSWORD = strenv(SOURCE_PASSWORD) |
120-
.retrieval.spec.physicalSnapshot.options.envs.PGHOST = strenv(SOURCE_HOST) |
121-
.retrieval.spec.physicalSnapshot.options.envs.PGPORT = env(SOURCE_PORT) |
122118
.retrieval.spec.physicalRestore.options.customTool.command = "pg_basebackup -X stream -D " + strenv(DLE_TEST_MOUNT_DIR) + "/" + strenv(DLE_TEST_POOL_NAME) + "/data"
123119
' "${configDir}/server.yml"
124120

engine/test/5.logical_rds.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ metaDir="$HOME/.dblab/engine/meta"
3636
# Copy the contents of configuration example
3737
mkdir -p "${configDir}"
3838

39-
curl https://gitlab.com/postgres-ai/database-lab/-/raw/"${CI_COMMIT_BRANCH:-master}"/engine/configs/config.example.logical_rds_iam.yml \
39+
curl https://gitlab.com/postgres-ai/database-lab/-/raw/"${TAG:-master}"/engine/configs/config.example.logical_rds_iam.yml \
4040
--output "${configDir}/server.yml"
4141

4242
# Edit the following options

0 commit comments

Comments
 (0)