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

Release 202212.0 patch v2. #51

Merged
merged 6 commits into from
Mar 17, 2023
Merged

Release 202212.0 patch v2. #51

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
5575f82
CC-26175: Add robot tests
artem-png Feb 27, 2023
54099d6
CC-26175 use bucket name from vars
artem-png Feb 28, 2023
c7ac43c
FRW-1238 integration.
asmarovydlo Mar 10, 2023
fa5d3ba
FRW-42 DevVM deprecation integration.
asmarovydlo Mar 10, 2023
9258db5
FRW-125 update CI to use php 8.1
asmarovydlo Mar 10, 2023
6dfbd9e
Merge pull request #49 from spryker-shop/feature/cc-26175/dev-add-rob…
DmitryLymarenko Mar 14, 2023
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
186 changes: 183 additions & 3 deletions .github/workflows/ci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,10 +18,11 @@ jobs:
matrix:
php-version: [
'8.0',
'8.1'
]

env:
APPLICATION_ENV: devtest
APPLICATION_ENV: ci.mysql
APPLICATION_STORE: DE
PROJECT: suite

Expand All @@ -46,7 +47,7 @@ jobs:
uses: elastic/elastic-github-actions/elasticsearch@master
with:
stack-version: 7.10.0
port: 10005
port: 9200

- uses: actions/setup-node@v1
with:
Expand Down Expand Up @@ -151,11 +152,88 @@ jobs:
run: vendor/bin/phpmd src/ text vendor/spryker/architecture-sniffer/src/ruleset.xml --minimumpriority 2

- name: Run PHPStan
run: vendor/bin/phpstan analyze -l 5 -c phpstan.neon src/ --debug
run: vendor/bin/phpstan analyze -l 5 -c phpstan.neon src/

- name: Run Security check
run: vendor/bin/console security:check

php-81-mariadb-glue-alpine:
name: "PHP 8.1 / MariaDB / Glue / Alpine"
runs-on: ubuntu-20.04
env:
PROGRESS_TYPE: plain
SPRYKER_PLATFORM_IMAGE: spryker/php:8.1
TRAVIS: 1

steps:
- uses: actions/checkout@v2

- name: Install apt-packages
run: |
sudo apt-get install apache2-utils
- name: Install docker-compose
run: |
sudo curl -L "https://github.com/docker/compose/releases/download/1.27.4/docker-compose-$(uname -s)-$(uname -m)" -o /usr/local/bin/docker-compose
sudo chmod +x /usr/local/bin/docker-compose
- name: Run docker
run: |
git clone https://github.com/spryker/docker-sdk.git ./docker
docker/sdk boot deploy.ci.api.mariadb.yml -v
docker/sdk up -t -v
docker/sdk testing codecept fixtures
docker/sdk testing console queue:worker:start --stop-when-empty
docker/sdk testing codecept run -c codeception.api.yml

php-81-mariadb-acceptance-alpine:
name: "PHP 8.1 / MariaDB / Acceptance / Alpine"
runs-on: ubuntu-20.04
env:
PROGRESS_TYPE: plain
SPRYKER_PLATFORM_IMAGE: spryker/php:8.1
TRAVIS: 1

steps:
- uses: actions/checkout@v2

- name: Install apt-packages
run: |
sudo apt-get install apache2-utils
- name: Install docker-compose
run: |
sudo curl -L "https://github.com/docker/compose/releases/download/1.27.4/docker-compose-$(uname -s)-$(uname -m)" -o /usr/local/bin/docker-compose
sudo chmod +x /usr/local/bin/docker-compose
- name: Run docker
run: |
git clone https://github.com/spryker/docker-sdk.git ./docker
docker/sdk boot -v deploy.ci.acceptance.mariadb.yml
docker/sdk up -t
docker/sdk testing console queue:worker:start --stop-when-empty
docker/sdk testing codecept run -c codeception.acceptance.yml

php-81-mariadb-functional-alpine:
name: "PHP 8.1 / MariaDB / Functional / Alpine"
runs-on: ubuntu-20.04
env:
PROGRESS_TYPE: plain
SPRYKER_PLATFORM_IMAGE: spryker/php:8.1
TRAVIS: 1

steps:
- uses: actions/checkout@v2

- name: Install apt-packages
run: |
sudo apt-get install apache2-utils
- name: Install docker-compose
run: |
sudo curl -L "https://github.com/docker/compose/releases/download/2.12.0/docker-compose-$(uname -s)-$(uname -m)" -o /usr/local/bin/docker-compose
sudo chmod +x /usr/local/bin/docker-compose
- name: Run docker
run: |
git clone https://github.com/spryker/docker-sdk.git ./docker
docker/sdk boot deploy.ci.functional.mariadb.yml -v
docker/sdk up -t -v
docker/sdk testing codecept run -c codeception.functional.yml
php-80-mariadb-glue-alpine:
name: "PHP 8.0 / MariaDB / Glue / Alpine"
runs-on: ubuntu-20.04
Expand Down Expand Up @@ -344,3 +422,105 @@ jobs:
- run: docker run -t --rm -e SPRYKER_NGINX_CGI_HOST_YVES_EU=localhost -e SPRYKER_NGINX_CGI_HOST_ZED_EU=localhost -e SPRYKER_NGINX_CGI_HOST_GLUE_EU=localhost -e SPRYKER_NGINX_CGI_HOST_YVES_US=localhost -e SPRYKER_NGINX_CGI_HOST_GLUE_US=localhost -e SPRYKER_NGINX_CGI_HOST_ZED_US=localhost -e ALLOWED_IP=127.0.0.1 spryker_b2c_marketplace_frontend:1.0-frontend nginx -t
- run: docker run -t --rm --entrypoint='' spryker_b2c_marketplace_frontend:1.0-frontend ls -al /data/public/Yves/assets/myhash
- run: docker run -t --rm --entrypoint='' spryker_b2c_marketplace_frontend:1.0-frontend ls -al /data/public/Zed/assets/

docker-alpine-php-8-0-mariadb-robot:
name: "Docker / Alpine / PHP 8.0 / MariaDB / Robot"
runs-on: ubuntu-20.04
env:
PROGRESS_TYPE: plain
SPRYKER_PLATFORM_IMAGE: spryker/php:8.0
TRAVIS: 1
ROBOT_TESTS_ARTIFACTS_BUCKET_REGION: eu-west-1
steps:
- uses: actions/checkout@v2

- uses: actions/setup-python@v4
with:
python-version: '3.9'

- name: Install packages
run: |
sudo apt-get install apache2-utils
sudo apt install awscli -q
python3 -m pip install --upgrade pip
python3 -m pip install -U robotframework
python3 -m pip install -U robotframework-requests
python3 -m pip install -U robotframework-jsonlibrary
python3 -m pip install -U robotframework-databaselibrary
python3 -m pip install PyMySQL
- name: Install docker-compose
run: |
sudo curl -L "https://github.com/docker/compose/releases/download/2.12.0/docker-compose-$(uname -s)-$(uname -m)" -o /usr/local/bin/docker-compose
sudo chmod +x /usr/local/bin/docker-compose
- name: Install Robot tests
run: |
git clone https://github.com/spryker/robotframework-suite-tests.git --single-branch --branch master robotframework-tests
- name: Install Project
continue-on-error: true
run: |
git clone https://github.com/spryker/docker-sdk.git ./docker
docker/sdk boot -v deploy.ci.acceptance.mariadb.yml
docker/sdk up -t -v
docker/sdk testing console queue:worker:start --stop-when-empty
sudo bash -c "echo '127.0.0.1 backend-api.at.spryker.local backend-api.de.spryker.local backend-gateway.at.spryker.local backend-gateway.de.spryker.local backoffice.at.spryker.local backoffice.de.spryker.local date-time-configurator-example.spryker.local glue.at.spryker.local glue.de.spryker.local yves.at.spryker.local yves.de.spryker.local' >> /etc/hosts"
- name: Run Tests
run: |
cd robotframework-tests
robot -v env:api_mp_b2c --exclude skip-due-to-issueORskip-due-to-refactoring -d results -s tests.api.mp_b2c.glue .
- name: Upload artifacts
if: always()
run: |
AWS_DEFAULT_REGION=${{env.ROBOT_TESTS_ARTIFACTS_BUCKET_REGION}} AWS_ACCESS_KEY_ID=${{ secrets.ROBOT_TESTS_ARTIFACTS_KEY }} AWS_SECRET_ACCESS_KEY=${{ secrets.ROBOT_TESTS_ARTIFACTS_SECRET }} aws s3 cp robotframework-tests/results s3://${{vars.ROBOT_TESTS_ARTIFACTS_BUCKET}}/b2c-mp-robot-api-ci/${GITHUB_RUN_ID}/PHP8.0MariaDBRobot/ \
--recursive \
--expires "$(date -d '+7 days' --utc +'%Y-%m-%dT%H:%M:%SZ')"

docker-alpine-php-8-1-postgresql-robot:
name: "Docker / Alpine / PHP 8.1 / PostgreSQL / Robot"
runs-on: ubuntu-20.04
env:
PROGRESS_TYPE: plain
SPRYKER_PLATFORM_IMAGE: spryker/php:8.1
TRAVIS: 1
ROBOT_TESTS_ARTIFACTS_BUCKET_REGION: eu-west-1
steps:
- uses: actions/checkout@v2

- uses: actions/setup-python@v4
with:
python-version: '3.9'

- name: Install packages
run: |
sudo apt-get install apache2-utils
sudo apt install awscli -q
python3 -m pip install --upgrade pip
python3 -m pip install -U robotframework
python3 -m pip install -U robotframework-requests
python3 -m pip install -U robotframework-jsonlibrary
python3 -m pip install -U robotframework-databaselibrary
python3 -m pip install psycopg2-binary
- name: Install docker-compose
run: |
sudo curl -L "https://github.com/docker/compose/releases/download/2.12.0/docker-compose-$(uname -s)-$(uname -m)" -o /usr/local/bin/docker-compose
sudo chmod +x /usr/local/bin/docker-compose
- name: Install Robot tests
run: |
git clone https://github.com/spryker/robotframework-suite-tests.git --single-branch --branch master robotframework-tests
- name: Install Project
continue-on-error: true
run: |
git clone https://github.com/spryker/docker-sdk.git ./docker
docker/sdk boot -v deploy.ci.acceptance.yml
docker/sdk up -t -v
docker/sdk testing console queue:worker:start --stop-when-empty
sudo bash -c "echo '127.0.0.1 backend-api.at.spryker.local backend-api.de.spryker.local backend-gateway.at.spryker.local backend-gateway.de.spryker.local backoffice.at.spryker.local backoffice.de.spryker.local date-time-configurator-example.spryker.local glue.at.spryker.local glue.de.spryker.local yves.at.spryker.local yves.de.spryker.local' >> /etc/hosts"
- name: Run Tests
run: |
cd robotframework-tests
robot -v env:api_mp_b2c -v db_engine:psycopg2 --exclude skip-due-to-issueORskip-due-to-refactoring -d results -s tests.api.mp_b2c.glue .
- name: Upload artifacts
if: always()
run: |
AWS_DEFAULT_REGION=${{env.ROBOT_TESTS_ARTIFACTS_BUCKET_REGION}} AWS_ACCESS_KEY_ID=${{ secrets.ROBOT_TESTS_ARTIFACTS_KEY }} AWS_SECRET_ACCESS_KEY=${{ secrets.ROBOT_TESTS_ARTIFACTS_SECRET }} aws s3 cp robotframework-tests/results s3://${{vars.ROBOT_TESTS_ARTIFACTS_BUCKET}}/b2c-mp-robot-api-ci/${GITHUB_RUN_ID}/PHP8.1PostgreSQLRobot/ \
--recursive \
--expires "$(date -d '+7 days' --utc +'%Y-%m-%dT%H:%M:%SZ')"
4 changes: 0 additions & 4 deletions .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,10 +50,6 @@ config/Yves/cache_bust.php
/public/*/assets/
/public/*/dist/

# vagrant stuff
.vagrant
Vagrantfile

# docker stuff
/docker/
/.docker-sync/
Expand Down
8 changes: 1 addition & 7 deletions README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -129,7 +129,7 @@ You've set up your Spryker B2C Demo Marketplace and can access your applications

This section describes the most common issues related to the installation of the B2C Demo Marketplace.

For a complete troubleshooting, see [Troubleshooting Spryker in Docker issues](https://documentation.spryker.com/docs/troubleshooting-spryker-in-docker-issues) or [Troubleshooting Spryker in Vagrant installation issues](https://documentation.spryker.com/docs/troubleshooting-spryker-in-vagrant-installation-issues).
For a complete troubleshooting, see [Troubleshooting Spryker in Docker issues](https://documentation.spryker.com/docs/troubleshooting-spryker-in-docker-issues).

**when**

Expand Down Expand Up @@ -169,12 +169,6 @@ docker/sdk up --build --assets --data

For detailed installation instructions of Spryker with Docker, see [Installing Spryker with Docker](https://documentation.spryker.com/docs/installing-spryker-with-docker).


## Installation of B2C Demo Marketplace with Vagrant
For detailed installation instructions of Spryker with Vagrant, see [Installing with Development Virtual Machine](https://documentation.spryker.com/docs/dev-getting-started#installing-spryker-with-development-virtual-machine).



## Glue API reference

See Glue API reference at [REST API reference](https://documentation.spryker.com/docs/rest-api-reference#/rest-api-reference).
Expand Down
36 changes: 18 additions & 18 deletions composer.lock
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

0 config/Shared/common/config_oauth-devvm.php → config/Shared/common/config_oauth.php
View file
Open in desktop
File renamed without changes.
2 changes: 1 addition & 1 deletion config/Shared/config_default-ci.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -98,7 +98,7 @@
// ------------------------------ AUTHENTICATION ------------------------------
// ----------------------------------------------------------------------------

require 'common/config_oauth-devvm.php';
require 'common/config_oauth.php';

// ----------------------------------------------------------------------------
// ------------------------------ SERVICES ------------------------------------
Expand Down
Loading