Skip to content

Commit

Permalink
CC-34246 Reverted redundant changes
Browse files Browse the repository at this point in the history
  • Loading branch information
olhalivitchuk committed Nov 11, 2024
1 parent 922e443 commit e8b66df
Show file tree
Hide file tree
Showing 2 changed files with 37 additions and 54 deletions.
3 changes: 3 additions & 0 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -707,6 +707,7 @@ jobs:

- name: Install packages
run: |
sudo apt-get update
sudo apt install awscli -q
python3 -m pip install --upgrade pip
python3 -m pip install -U robotframework
Expand Down Expand Up @@ -761,6 +762,7 @@ jobs:

- name: Install packages
run: |
sudo apt-get update
sudo apt install awscli -q
python3 -m pip install --upgrade pip
python3 -m pip install -U robotframework
Expand Down Expand Up @@ -819,6 +821,7 @@ jobs:

- name: Install packages
run: |
sudo apt-get update
sudo apt install awscli -q
python3 -m pip install --upgrade pip
python3 -m pip install -U robotframework
Expand Down
88 changes: 34 additions & 54 deletions deploy.ci.acceptance.mariadb.robot.yml
Original file line number Diff line number Diff line change
Expand Up @@ -51,32 +51,15 @@ regions:
name: Spryker No-Reply
email: [email protected]
database:
database: app-store-suite-docker
database: us-docker
username: spryker
password: secret
broker:
namespace: app-store-suite-docker
namespace: us-docker
key_value_store:
namespace: 8
namespace: 2
search:
namespace: app-store-suite_search

REGISTRY:
services:
mail:
sender:
name: Spryker No-Reply
email: [email protected]
database:
database: registry-service-docker
username: spryker
password: secret
broker:
namespace: registry-service-docker
key_value_store:
namespace: 9
search:
namespace: registry-service_search
namespace: us_search

groups:
EU:
Expand Down Expand Up @@ -139,11 +122,11 @@ groups:
region: EU
entry-point: BackendApi

GLOBAL:
region: GLOBAL
US:
region: US
applications:
app_store_suite_zed:
application: zed
mportal_us:
application: merchant-portal
endpoints:
mp.us.spryker.local:
region: US
Expand All @@ -152,38 +135,40 @@ groups:
services:
session:
namespace: 4
app_store_suite_glue_backend:
application: glue-backend
endpoints:
glue-backend.apps.spryker.local:
entry-point: Acp/AppsGlue
region: GLOBAL

REGISTRY:
region: REGISTRY
applications:
registry_service_backoffice:
application: zed
yves_us:
application: yves
endpoints:
# acp-toolbox/bin/registry-service.sh:7
backoffice.registry.spryker.local:
entry-point: Acp/RegistryServiceBackoffice
region: REGISTRY
yves.us.spryker.local:
region: US
services:
session:
namespace: 5
registry_service_yves:
application: yves
glue_us:
application: glue
endpoints:
glue.us.spryker.local:
region: US
glue_storefront_us:
application: glue-storefront
endpoints:
glue-storefront.us.spryker.local:
region: EU
glue_backend_us:
application: glue-backend
endpoints:
# acp-toolbox/bin/registry-service.sh:8
yves.registry.spryker.local:
entry-point: Acp/RegistryServiceYves
region: REGISTRY
glue-backend.us.spryker.local:
region: EU
backoffice_us:
application: backoffice
endpoints:
backoffice.us.spryker.local:
region: US
primal: true
services:
session:
namespace: 6
registry_service_glue:
application: glue-backend
backend_gateway_us:
application: backend-gateway
endpoints:
backend-gateway.us.spryker.local:
region: US
Expand Down Expand Up @@ -228,11 +213,6 @@ services:
engine: chromedriver

docker:
compose:
yamls:
- acp-toolbox/docker-services/localstack/docker-compose.franken.yml
- acp-toolbox/docker-services/mb2local/docker-compose.franken.yml

ssl:
enabled: false

Expand Down

0 comments on commit e8b66df

Please sign in to comment.