Skip to content

Commit

Permalink
upgrade release.sh to docker compose, prepare 3.2.2
Browse files Browse the repository at this point in the history
  • Loading branch information
Slach committed Aug 11, 2024
1 parent b465336 commit 6179466
Show file tree
Hide file tree
Showing 4 changed files with 8 additions and 8 deletions.
2 changes: 1 addition & 1 deletion .config/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -159,6 +159,6 @@ services:
grafana_image: ${GRAFANA_IMAGE:-grafana}
```
In this example we are assigning the environment variable `GRAFANA_IMAGE` to the build arg `grafana_image` with a default value of `grafana`. This will give you the possibility to set the value while running the docker-compose commands which might be convinent in some scenarios.
In this example we are assigning the environment variable `GRAFANA_IMAGE` to the build arg `grafana_image` with a default value of `grafana`. This will give you the possibility to set the value while running the docker compose commands which might be convinent in some scenarios.

---
8 changes: 4 additions & 4 deletions release.sh
Original file line number Diff line number Diff line change
Expand Up @@ -10,13 +10,13 @@ git config core.autocrlf input
git config user.name "$GITHUB_LOGIN"
git config user.email "$GITHUB_EMAIL"
bump2version --verbose $1
docker-compose stop
docker-compose run --rm frontend_builder
docker-compose run --rm backend_builder
docker compose stop
docker compose run --rm frontend_builder
docker compose run --rm backend_builder
dos2unix ./dist/*
chmod +rx ./dist
chmod +rx -R ./dist/altinity-clickhouse-plugin*
docker-compose run --rm plugin_signer
docker compose run --rm plugin_signer
git add .
git diff-index --quiet HEAD || git commit -s -m "prepare to new release, $(grep current_version .bumpversion.cfg)"
git push --tags
2 changes: 1 addition & 1 deletion tests/testflows/regression.py
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@ def regression(self, before, after):
project_root_dir = os.path.join(current_dir(), "..", "..")
self.context.project_root_dir = project_root_dir

with Given("docker-compose cluster"):
with Given("docker compose cluster"):
self.context.cluster = cluster.cluster(frame=inspect.currentframe())

with And("I copy CA Cert"):
Expand Down
4 changes: 2 additions & 2 deletions tests/testflows/steps/cluster.py
Original file line number Diff line number Diff line change
Expand Up @@ -137,7 +137,7 @@ def bash(self, node, timeout=120):
return self._bash[id]

def __enter__(self):
with Given("docker-compose cluster"):
with Given("docker compose cluster"):
self.up()
return self

Expand Down Expand Up @@ -227,7 +227,7 @@ def up(self, timeout=30 * 60):
env_file = os.path.join(current_dir(), "..", "infra", "env_file")
cmd = self.command(
None,
f"set -o pipefail && {self.docker_compose} --env-file=\"{env_file}\" up -d 2>&1 | tee",
f"set -o pipefail && {self.docker_compose} --env-file=\"{env_file}\" up -d selenium-standalone 2>&1 | tee",
timeout=timeout,
)
with Then("check there are no unhealthy containers"):
Expand Down

0 comments on commit 6179466

Please sign in to comment.