Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[#1397] Updated demo and test images. #1412

Merged
merged 1 commit into from
Sep 26, 2024
Merged

[#1397] Updated demo and test images. #1412

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions .circleci/config.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -484,7 +484,7 @@ jobs:
# Note that here and below we are using "destination" demo image - this
# is to allow updating of this image from CI tests without jeopardizing
# main demo image.
VORTEX_DB_IMAGE: drevops/drevops-mariadb-drupal-data-demo-destination-10.x
VORTEX_DB_IMAGE: drevops/vortex-dev-mariadb-drupal-data-demo-destination-10.x
# Use a separate tag to make sure that pushed image does not affect
# other tests (pushing broken image as 'latest' would fail other tests).
VORTEX_DEPLOY_CONTAINER_REGISTRY_IMAGE_TAG: vortex-dev-didi-database-fi
Expand All @@ -502,7 +502,7 @@ jobs:
environment:
VORTEX_DB_DOWNLOAD_SOURCE: VORTEX_CONTAINER_REGISTRY
VORTEX_DB_DOWNLOAD_FORCE: 1
VORTEX_DB_IMAGE: drevops/drevops-mariadb-drupal-data-demo-destination-10.x
VORTEX_DB_IMAGE: drevops/vortex-dev-mariadb-drupal-data-demo-destination-10.x
VORTEX_DEPLOY_CONTAINER_REGISTRY_IMAGE_TAG: vortex-dev-database-ii
# Also, use this job to test pushing of the DB image to the container
# registry so replicate what database-nightly job would do.
Expand All @@ -518,15 +518,15 @@ jobs:
vortex-dev-didi-build-fi:
<<: *job_build
environment:
VORTEX_DB_IMAGE: drevops/drevops-mariadb-drupal-data-demo-destination-10.x:drevops_dev_didi_database_fi
VORTEX_DB_IMAGE: drevops/vortex-dev-mariadb-drupal-data-demo-destination-10.x:vortex-dev-didi-database-fi
# Use custom cache key for this workflow to make sure that caches from
# the main workflow are separated from this one.
VORTEX_CI_DB_CACHE_BRANCH: vortex-dev-didi-fi

vortex-dev-didi-build-ii:
<<: *job_build
environment:
VORTEX_DB_IMAGE: drevops/drevops-mariadb-drupal-data-demo-destination-10.x:drevops_dev_database_ii
VORTEX_DB_IMAGE: drevops/vortex-dev-mariadb-drupal-data-demo-destination-10.x:vortex-dev-database-ii
# Use custom cache key for this workflow to make sure that caches from
# the main workflow are separated from this one.
VORTEX_CI_DB_CACHE_BRANCH: vortex-dev-didi-ii
Expand Down
2 changes: 1 addition & 1 deletion .docker/mariadb.dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
# @see https://hub.docker.com/r/uselagoon/mariadb-10.11-drupal/tags
# @see https://github.com/uselagoon/lagoon-images/tree/main/images/mariadb-drupal
#
# Use drevops/drevops-mariadb-drupal-data as a starting container image for your
# Use drevops/mariadb-drupal-data as a starting container image for your
# database-in-image database.
# @see https://github.com/drevops/mariadb-drupal-data
#
Expand Down
2 changes: 1 addition & 1 deletion .env
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -245,6 +245,6 @@ VORTEX_DB_DOWNLOAD_CURL_URL=https://github.com/drevops/vortex/releases/download/
#; The line below will be automatically uncommented for database-in-image
#; storage. It is commented out to allow running non-database-in-image
# workflow by default.
##### VORTEX_DB_IMAGE=drevops/drevops-mariadb-drupal-data-demo-10.x:latest
##### VORTEX_DB_IMAGE=drevops/vortex-dev-mariadb-drupal-data-demo-10.x:latest
#;> VORTEX_DB_IMAGE
#;> DEMO
1 change: 0 additions & 1 deletion .vortex/docs/.utils/variables/variables.inline-code-extra.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
composer.lock
drevops/drevops-mariadb-drupal-data
.ahoy.yml
.ahoy.local.yml
.ahoy.local.example.yml
Expand Down
2 changes: 1 addition & 1 deletion .vortex/installer/src/Command/InstallCommand.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -794,7 +794,7 @@ protected function collectAnswers() {
$this->setAnswer('database_image', '');
}
else {
$this->askForAnswer('database_image', ' What is your database image name and a tag (e.g. drevops/drevops-mariadb-drupal-data:latest)?');
$this->askForAnswer('database_image', ' What is your database image name and a tag (e.g. drevops/mariadb-drupal-data:latest)?');
}
}
// @formatter:on
Expand Down
8 changes: 4 additions & 4 deletions .vortex/tests/bats/install.initial.bats
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -222,24 +222,24 @@ load _helper.bash
@test "Install into empty directory; db from curl; storage is container image" {
export VORTEX_DB_DOWNLOAD_SOURCE=curl

export VORTEX_DB_IMAGE="drevops/drevops-mariadb-drupal-data-demo-10.x:latest"
export VORTEX_DB_IMAGE="drevops/vortex-dev-mariadb-drupal-data-demo-10.x:latest"

run_installer_quiet

assert_file_contains ".env" "VORTEX_DB_DOWNLOAD_SOURCE=curl"
assert_file_contains ".env" "VORTEX_DB_DOWNLOAD_CURL_URL="
assert_file_contains ".env" "VORTEX_DB_IMAGE=drevops/drevops-mariadb-drupal-data-demo-10.x:latest"
assert_file_contains ".env" "VORTEX_DB_IMAGE=drevops/vortex-dev-mariadb-drupal-data-demo-10.x:latest"
}

@test "Install into empty directory; db from container image; storage is container image" {
export VORTEX_DB_DOWNLOAD_SOURCE=container_registry
export VORTEX_DB_IMAGE="drevops/drevops-mariadb-drupal-data-demo-10.x:latest"
export VORTEX_DB_IMAGE="drevops/vortex-dev-mariadb-drupal-data-demo-10.x:latest"

run_installer_quiet

assert_file_contains ".env" "VORTEX_DB_DOWNLOAD_SOURCE=container_registry"
assert_file_not_contains ".env" "VORTEX_DB_DOWNLOAD_CURL_URL="
assert_file_contains ".env" "VORTEX_DB_IMAGE=drevops/drevops-mariadb-drupal-data-demo-10.x:latest"
assert_file_contains ".env" "VORTEX_DB_IMAGE=drevops/vortex-dev-mariadb-drupal-data-demo-10.x:latest"
}

@test "Install into empty directory; Vortex scripts are not modified" {
Expand Down
8 changes: 4 additions & 4 deletions .vortex/tests/bats/workflow.storage.curl.bats
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,12 +2,12 @@
#
# Workflows using different types of DB storage.
#
# Throughout these tests, a "drevops/drevops-mariadb-drupal-data-test-10.x:latest"
# Throughout these tests, a "drevops/vortex-dev-mariadb-drupal-data-test-10.x:latest"
# test image is used: it is seeded with content from the pre-built fixture
# "Star wars" test site.
#
# When debugging failed tests locally, make sure that there are no untagged
# "drevops/drevops-mariadb-drupal-data-*" images.
# "drevops/vortex-dev-mariadb-drupal-data-*" images.
#
# In some cases, shell may report platform incorrectly. Run with forced platform:
# DOCKER_DEFAULT_PLATFORM=linux/amd64 bats --tap tests/bats/workflow1.bats
Expand All @@ -27,7 +27,7 @@ load _helper.workflow.bash
# @todo: build.sh may need to have a support to create a local image if
# it does not exist.
# Use a test image. Image always must use a tag.
export VORTEX_DB_IMAGE="drevops/drevops-mariadb-drupal-data-test-10.x:latest"
export VORTEX_DB_IMAGE="drevops/vortex-dev-mariadb-drupal-data-test-10.x:latest"

# Explicitly specify that we do not want to login into the public registry
# to use test image.
Expand All @@ -50,7 +50,7 @@ load _helper.workflow.bash
assert_file_contains ".env" "VORTEX_DB_DOWNLOAD_SOURCE=curl"
assert_file_contains ".env" "VORTEX_DB_IMAGE=${VORTEX_DB_IMAGE}"
# Assert that demo config was removed as a part of the installation.
assert_file_not_contains ".env" "VORTEX_DB_IMAGE=drevops/drevops-mariadb-drupal-data-demo-10.x:latest"
assert_file_not_contains ".env" "VORTEX_DB_IMAGE=drevops/vortex-dev-mariadb-drupal-data-demo-10.x:latest"
assert_file_contains ".env" "VORTEX_DB_DOWNLOAD_CURL_URL="

assert_ahoy_build
Expand Down
8 changes: 4 additions & 4 deletions .vortex/tests/bats/workflow.storage.image.bats
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,12 +2,12 @@
#
# Workflows using different types of DB storage.
#
# Throughout these tests, a "drevops/drevops-mariadb-drupal-data-test-10.x:latest"
# Throughout these tests, a "drevops/vortex-dev-mariadb-drupal-data-test-10.x:latest"
# test image is used: it is seeded with content from the pre-built fixture
# "Star wars" test site.
#
# When debugging failed tests locally, make sure that there are no untagged
# "drevops/drevops-mariadb-drupal-data-*" images.
# "drevops/vortex-dev-mariadb-drupal-data-*" images.
#
# In some cases, shell may report platform incorrectly. Run with forced platform:
# DOCKER_DEFAULT_PLATFORM=linux/amd64 bats --tap tests/bats/workflow1.bats
Expand All @@ -23,7 +23,7 @@ load _helper.workflow.bash
export VORTEX_DB_DOWNLOAD_SOURCE=container_registry

# Use a test image. Image always must use a tag.
export VORTEX_DB_IMAGE="drevops/drevops-mariadb-drupal-data-test-10.x:latest"
export VORTEX_DB_IMAGE="drevops/vortex-dev-mariadb-drupal-data-test-10.x:latest"

# Do not use demo database - testing demo database discovery is another test.
export VORTEX_INSTALL_DEMO_SKIP=1
Expand All @@ -50,7 +50,7 @@ load _helper.workflow.bash
assert_file_contains ".env" "VORTEX_DB_DOWNLOAD_SOURCE=container_registry"
assert_file_contains ".env" "VORTEX_DB_IMAGE=${VORTEX_DB_IMAGE}"
# Assert that demo config was removed as a part of the installation.
assert_file_not_contains ".env" "VORTEX_DB_IMAGE=drevops/drevops-mariadb-drupal-data-demo-10.x:latest"
assert_file_not_contains ".env" "VORTEX_DB_IMAGE=drevops/vortex-dev-mariadb-drupal-data-demo-10.x:latest"
assert_file_not_contains ".env" "VORTEX_DB_DOWNLOAD_CURL_URL="

assert_ahoy_build
Expand Down
8 changes: 4 additions & 4 deletions .vortex/tests/bats/workflow.storage.image_cached.bats
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,12 +2,12 @@
#
# Workflows using different types of DB storage.
#
# Throughout these tests, a "drevops/drevops-mariadb-drupal-data-test-10.x:latest"
# Throughout these tests, a "drevops/vortex-dev-mariadb-drupal-data-test-10.x:latest"
# test image is used: it is seeded with content from the pre-built fixture
# "Star wars" test site.
#
# When debugging failed tests locally, make sure that there are no untagged
# "drevops/drevops-mariadb-drupal-data-*" images.
# "drevops/vortex-dev-mariadb-drupal-data-*" images.
#
# In some cases, shell may report platform incorrectly. Run with forced platform:
# DOCKER_DEFAULT_PLATFORM=linux/amd64 bats --tap tests/bats/workflow1.bats
Expand All @@ -25,7 +25,7 @@ load _helper.workflow.bash
export VORTEX_DB_DOWNLOAD_SOURCE=container_registry

# Use a test image. Image always must use a tag.
export VORTEX_DB_IMAGE="drevops/drevops-mariadb-drupal-data-test-10.x:latest"
export VORTEX_DB_IMAGE="drevops/vortex-dev-mariadb-drupal-data-test-10.x:latest"

# Do not use demo database - testing demo database discovery is another test.
export VORTEX_INSTALL_DEMO_SKIP=1
Expand All @@ -52,7 +52,7 @@ load _helper.workflow.bash
assert_file_contains ".env" "VORTEX_DB_DOWNLOAD_SOURCE=container_registry"
assert_file_contains ".env" "VORTEX_DB_IMAGE=${VORTEX_DB_IMAGE}"
# Assert that demo config was removed as a part of the installation.
assert_file_not_contains ".env" "VORTEX_DB_IMAGE=drevops/drevops-mariadb-drupal-data-demo-10.x:latest"
assert_file_not_contains ".env" "VORTEX_DB_IMAGE=drevops/vortex-dev-mariadb-drupal-data-demo-10.x:latest"
assert_file_not_contains ".env" "VORTEX_DB_DOWNLOAD_CURL_URL="

step "Initial build to use data image."
Expand Down
Loading