From 7246112480ccec39a8d748344e747a89f7239456 Mon Sep 17 00:00:00 2001 From: Arne Tarara Date: Fri, 18 Oct 2024 13:20:03 +0200 Subject: [PATCH] Install is now down in separate flow; Re-Using volumes --- energy-tests/compose-mariadb.yml | 8 +++--- energy-tests/compose-postgres.yml | 8 +++--- energy-tests/compose-sqlite.yml | 6 +++-- ...ge_scenario-fpm-mariadb-event-chromium.yml | 9 ------- ...age_scenario-fpm-mariadb-talk-chromium.yml | 9 ------- .../usage_scenario-mariadb-docs-chromium.yml | 9 ------- .../usage_scenario-mariadb-docs-firefox.yml | 9 ------- .../usage_scenario-mariadb-event-chromium.yml | 9 ------- .../usage_scenario-mariadb-event-firefox.yml | 10 ------- ...usage_scenario-mariadb-install-firefox.yml | 27 +++++++++++++++++++ .../usage_scenario-mariadb-talk-chromium.yml | 9 ------- .../usage_scenario-mariadb-talk-firefox.yml | 9 ------- .../usage_scenario-postgres-docs-chromium.yml | 9 ------- .../usage_scenario-postgres-docs-firefox.yml | 9 ------- ...usage_scenario-postgres-event-chromium.yml | 9 ------- .../usage_scenario-postgres-event-firefox.yml | 9 ------- ...sage_scenario-postgres-install-firefox.yml | 27 +++++++++++++++++++ .../usage_scenario-postgres-talk-chromium.yml | 9 ------- .../usage_scenario-postgres-talk-firefox.yml | 9 ------- .../usage_scenario-sqlite-docs-chromium.yml | 9 ------- .../usage_scenario-sqlite-docs-firefox.yml | 9 ------- .../usage_scenario-sqlite-event-chromium.yml | 9 ------- .../usage_scenario-sqlite-event-firefox.yml | 9 ------- .../usage_scenario-sqlite-install-firefox.yml | 27 +++++++++++++++++++ .../usage_scenario-sqlite-talk-chromium.yml | 9 ------- .../usage_scenario-sqlite-talk-firefox.yml | 9 ------- 26 files changed, 93 insertions(+), 191 deletions(-) create mode 100644 energy-tests/usage_scenario-mariadb-install-firefox.yml create mode 100644 energy-tests/usage_scenario-postgres-install-firefox.yml create mode 100644 energy-tests/usage_scenario-sqlite-install-firefox.yml diff --git a/energy-tests/compose-mariadb.yml b/energy-tests/compose-mariadb.yml index 82602b1a..264ec20b 100644 --- a/energy-tests/compose-mariadb.yml +++ b/energy-tests/compose-mariadb.yml @@ -9,8 +9,8 @@ services: image: mariadb:11.0.2-jammy restart: always command: --transaction-isolation=READ-COMMITTED --log-bin=binlog --binlog-format=ROW - #volumes: - # - db:/var/lib/mysql # This is the usual way of starting this service in a container, but we do not need persistent data storage for benchmarking + volumes: + - db:/var/lib/mysql environment: - MYSQL_ROOT_PASSWORD=TheGibson - MYSQL_PASSWORD=TheGibson @@ -27,8 +27,8 @@ services: - 8080:80 links: - db - #volumes: - # - nextcloud:/var/www/html # This is the usual way of using nextcloud in a container, but we do not need persistent data storage for benchmarking + volumes: + - nextcloud:/var/www/html environment: - MYSQL_PASSWORD=TheGibson - MYSQL_DATABASE=nextcloud diff --git a/energy-tests/compose-postgres.yml b/energy-tests/compose-postgres.yml index 75abb2d8..b0aaebe0 100644 --- a/energy-tests/compose-postgres.yml +++ b/energy-tests/compose-postgres.yml @@ -8,8 +8,8 @@ services: db: image: postgres:15.3-alpine3.18 restart: always - #volumes: - # - db:/var/lib/postgresql/data:Z # This is the usual way of starting this service in a container, but we do not need persistent data storage for benchmarking + volumes: + - db:/var/lib/postgresql/data environment: - POSTGRES_PASSWORD=TheGibson - POSTGRES_DB=nextcloud @@ -25,8 +25,8 @@ services: - 8080:80 links: - db - #volumes: - # - nextcloud:/var/www/html # This is the usual way of using nextcloud in a container, but we do not need persistent data storage for benchmarking + volumes: + - nextcloud:/var/www/html environment: - POSTGRES_PASSWORD=TheGibson - POSTGRES_DB=nextcloud diff --git a/energy-tests/compose-sqlite.yml b/energy-tests/compose-sqlite.yml index 198d5883..18f7922a 100644 --- a/energy-tests/compose-sqlite.yml +++ b/energy-tests/compose-sqlite.yml @@ -9,8 +9,10 @@ services: restart: always ports: - 8080:80 - #volumes: - # - nextcloud:/var/www/html # This is the usual way of using nextcloud in a container, but we do not need persistent data storage for benchmarking + environment: + SQLITE_DATABASE: owncloud2.db + volumes: + - nextcloud:/var/www/html healthcheck: test: curl --fail --silent http://nc interval: "1h" # effectively turns repeated healthchecks during runtime off diff --git a/energy-tests/usage_scenario-fpm-mariadb-event-chromium.yml b/energy-tests/usage_scenario-fpm-mariadb-event-chromium.yml index 557903e3..f54ebf6e 100644 --- a/energy-tests/usage_scenario-fpm-mariadb-event-chromium.yml +++ b/energy-tests/usage_scenario-fpm-mariadb-event-chromium.yml @@ -16,15 +16,6 @@ services: DISPLAY: ":0" # for debugging in non-headless mode flow: - - name: Install Nextcloud - container: gcb-playwright - commands: - - type: console - command: python3 /tmp/repo/energy-tests/nextcloud_install.py - note: Installing Nextcloud - read-notes-stdout: true - log-stdout: true - log-stderr: true - name: Login and create event container: gcb-playwright commands: diff --git a/energy-tests/usage_scenario-fpm-mariadb-talk-chromium.yml b/energy-tests/usage_scenario-fpm-mariadb-talk-chromium.yml index 641798bc..00e38762 100644 --- a/energy-tests/usage_scenario-fpm-mariadb-talk-chromium.yml +++ b/energy-tests/usage_scenario-fpm-mariadb-talk-chromium.yml @@ -19,15 +19,6 @@ services: DISPLAY: ":0" # for debugging in non-headless mode flow: - - name: Install Nextcloud - container: gcb-playwright - commands: - - type: console - command: python3 /tmp/repo/energy-tests/nextcloud_install.py - note: Installing Nextcloud - read-notes-stdout: true - log-stdout: true - log-stderr: true - name: Talk conversation container: gcb-playwright commands: diff --git a/energy-tests/usage_scenario-mariadb-docs-chromium.yml b/energy-tests/usage_scenario-mariadb-docs-chromium.yml index 04614692..12dc28d4 100644 --- a/energy-tests/usage_scenario-mariadb-docs-chromium.yml +++ b/energy-tests/usage_scenario-mariadb-docs-chromium.yml @@ -19,15 +19,6 @@ services: DISPLAY: ":0" # for debugging in non-headless mode flow: - - name: Install Nextcloud - container: gcb-playwright - commands: - - type: console - command: python3 /tmp/repo/energy-tests/nextcloud_install.py - note: Installing Nextcloud - read-notes-stdout: true - log-stdout: true - log-stderr: true - name: Create User container: gcb-playwright commands: diff --git a/energy-tests/usage_scenario-mariadb-docs-firefox.yml b/energy-tests/usage_scenario-mariadb-docs-firefox.yml index 199df16b..e8f3fe84 100644 --- a/energy-tests/usage_scenario-mariadb-docs-firefox.yml +++ b/energy-tests/usage_scenario-mariadb-docs-firefox.yml @@ -19,15 +19,6 @@ services: DISPLAY: ":0" # for debugging in non-headless mode flow: - - name: Install Nextcloud - container: gcb-playwright - commands: - - type: console - command: python3 /tmp/repo/energy-tests/nextcloud_install.py firefox - note: Installing Nextcloud - read-notes-stdout: true - log-stdout: true - log-stderr: true - name: Create User container: gcb-playwright commands: diff --git a/energy-tests/usage_scenario-mariadb-event-chromium.yml b/energy-tests/usage_scenario-mariadb-event-chromium.yml index ae2e79c7..780b66d7 100644 --- a/energy-tests/usage_scenario-mariadb-event-chromium.yml +++ b/energy-tests/usage_scenario-mariadb-event-chromium.yml @@ -16,15 +16,6 @@ services: DISPLAY: ":0" # for debugging in non-headless mode flow: - - name: Install Nextcloud - container: gcb-playwright - commands: - - type: console - command: python3 /tmp/repo/energy-tests/nextcloud_install.py - note: Installing Nextcloud - read-notes-stdout: true - log-stdout: true - log-stderr: true - name: Login and create event container: gcb-playwright commands: diff --git a/energy-tests/usage_scenario-mariadb-event-firefox.yml b/energy-tests/usage_scenario-mariadb-event-firefox.yml index b256355c..b9d53e78 100644 --- a/energy-tests/usage_scenario-mariadb-event-firefox.yml +++ b/energy-tests/usage_scenario-mariadb-event-firefox.yml @@ -16,16 +16,6 @@ services: DISPLAY: ":0" # for debugging in non-headless mode flow: - - name: Install Nextcloud - container: gcb-playwright - commands: - - type: console - command: python3 /tmp/repo/energy-tests/nextcloud_install.py firefox - note: Installing Nextcloud - read-notes-stdout: true - log-stdout: true - log-stderr: true - - name: Login and create event container: gcb-playwright commands: diff --git a/energy-tests/usage_scenario-mariadb-install-firefox.yml b/energy-tests/usage_scenario-mariadb-install-firefox.yml new file mode 100644 index 00000000..9b6b9541 --- /dev/null +++ b/energy-tests/usage_scenario-mariadb-install-firefox.yml @@ -0,0 +1,27 @@ +--- +name: Nextcloud - MariaDB - Install - Firefox +author: Arne Tarara +description: Installs the official Nextcloud image with a MariaDB. +compose-file: !include compose-mariadb.yml + +services: + gcb-playwright: + image: greencoding/gcb_playwright:v12 + depends_on: + nc: + condition: service_healthy +# volumes: +# - /tmp/.X11-unix:/tmp/.X11-unix # for debugging in non-headless mode + environment: + DISPLAY: ":0" # for debugging in non-headless mode + +flow: + - name: Install Nextcloud + container: gcb-playwright + commands: + - type: console + command: python3 /tmp/repo/energy-tests/nextcloud_install.py + note: Installing Nextcloud + read-notes-stdout: true + log-stdout: true + log-stderr: true diff --git a/energy-tests/usage_scenario-mariadb-talk-chromium.yml b/energy-tests/usage_scenario-mariadb-talk-chromium.yml index 5463f765..bf903daf 100644 --- a/energy-tests/usage_scenario-mariadb-talk-chromium.yml +++ b/energy-tests/usage_scenario-mariadb-talk-chromium.yml @@ -19,15 +19,6 @@ services: DISPLAY: ":0" # for debugging in non-headless mode flow: - - name: Install Nextcloud - container: gcb-playwright - commands: - - type: console - command: python3 /tmp/repo/energy-tests/nextcloud_install.py - note: Installing Nextcloud - read-notes-stdout: true - log-stdout: true - log-stderr: true - name: Talk conversation container: gcb-playwright commands: diff --git a/energy-tests/usage_scenario-mariadb-talk-firefox.yml b/energy-tests/usage_scenario-mariadb-talk-firefox.yml index 53224023..88193f8b 100644 --- a/energy-tests/usage_scenario-mariadb-talk-firefox.yml +++ b/energy-tests/usage_scenario-mariadb-talk-firefox.yml @@ -19,15 +19,6 @@ services: DISPLAY: ":0" # for debugging in non-headless mode flow: - - name: Install Nextcloud - container: gcb-playwright - commands: - - type: console - command: python3 /tmp/repo/energy-tests/nextcloud_install.py firefox - note: Installing Nextcloud - read-notes-stdout: true - log-stdout: true - log-stderr: true - name: Talk conversation container: gcb-playwright commands: diff --git a/energy-tests/usage_scenario-postgres-docs-chromium.yml b/energy-tests/usage_scenario-postgres-docs-chromium.yml index 9777b0af..7b637df8 100644 --- a/energy-tests/usage_scenario-postgres-docs-chromium.yml +++ b/energy-tests/usage_scenario-postgres-docs-chromium.yml @@ -19,15 +19,6 @@ services: DISPLAY: ":0" # for debugging in non-headless mode flow: - - name: Install Nextcloud - container: gcb-playwright - commands: - - type: console - command: python3 /tmp/repo/energy-tests/nextcloud_install.py - note: Installing Nextcloud - read-notes-stdout: true - log-stdout: true - log-stderr: true - name: Create User container: gcb-playwright commands: diff --git a/energy-tests/usage_scenario-postgres-docs-firefox.yml b/energy-tests/usage_scenario-postgres-docs-firefox.yml index c63541fc..be4d23c8 100644 --- a/energy-tests/usage_scenario-postgres-docs-firefox.yml +++ b/energy-tests/usage_scenario-postgres-docs-firefox.yml @@ -20,15 +20,6 @@ services: - nextcloud-setup-network flow: - - name: Install Nextcloud - container: gcb-playwright - commands: - - type: console - command: python3 /tmp/repo/energy-tests/nextcloud_install.py firefox - note: Installing Nextcloud - read-notes-stdout: true - log-stdout: true - log-stderr: true - name: Create User container: gcb-playwright commands: diff --git a/energy-tests/usage_scenario-postgres-event-chromium.yml b/energy-tests/usage_scenario-postgres-event-chromium.yml index e94bb3e2..9ce1c00a 100644 --- a/energy-tests/usage_scenario-postgres-event-chromium.yml +++ b/energy-tests/usage_scenario-postgres-event-chromium.yml @@ -17,15 +17,6 @@ services: flow: - - name: Install Nextcloud - container: gcb-playwright - commands: - - type: console - command: python3 /tmp/repo/energy-tests/nextcloud_install.py - note: Installing Nextcloud - read-notes-stdout: true - log-stdout: true - log-stderr: true - name: Login and create event container: gcb-playwright commands: diff --git a/energy-tests/usage_scenario-postgres-event-firefox.yml b/energy-tests/usage_scenario-postgres-event-firefox.yml index a95dd500..2e52227d 100644 --- a/energy-tests/usage_scenario-postgres-event-firefox.yml +++ b/energy-tests/usage_scenario-postgres-event-firefox.yml @@ -16,15 +16,6 @@ services: DISPLAY: ":0" # for debugging in non-headless mode flow: - - name: Install Nextcloud - container: gcb-playwright - commands: - - type: console - command: python3 /tmp/repo/energy-tests/nextcloud_install.py firefox - note: Installing Nextcloud - read-notes-stdout: true - log-stdout: true - log-stderr: true - name: Login and create event container: gcb-playwright commands: diff --git a/energy-tests/usage_scenario-postgres-install-firefox.yml b/energy-tests/usage_scenario-postgres-install-firefox.yml new file mode 100644 index 00000000..2a670980 --- /dev/null +++ b/energy-tests/usage_scenario-postgres-install-firefox.yml @@ -0,0 +1,27 @@ +--- +name: Nextcloud - PostgreSQL - Install - Firefox +author: Arne Tarara +description: Installs the official Nextcloud image with a PostgreSQL DB. +compose-file: !include compose-postgres.yml + +services: + gcb-playwright: + image: greencoding/gcb_playwright:v12 + depends_on: + nc: + condition: service_healthy +# volumes: +# - /tmp/.X11-unix:/tmp/.X11-unix # for debugging in non-headless mode + environment: + DISPLAY: ":0" # for debugging in non-headless mode + +flow: + - name: Install Nextcloud + container: gcb-playwright + commands: + - type: console + command: python3 /tmp/repo/energy-tests/nextcloud_install.py + note: Installing Nextcloud + read-notes-stdout: true + log-stdout: true + log-stderr: true diff --git a/energy-tests/usage_scenario-postgres-talk-chromium.yml b/energy-tests/usage_scenario-postgres-talk-chromium.yml index 25d939c7..b7dfc9c5 100644 --- a/energy-tests/usage_scenario-postgres-talk-chromium.yml +++ b/energy-tests/usage_scenario-postgres-talk-chromium.yml @@ -19,15 +19,6 @@ services: DISPLAY: ":0" # for debugging in non-headless mode flow: - - name: Install Nextcloud - container: gcb-playwright - commands: - - type: console - command: python3 /tmp/repo/energy-tests/nextcloud_install.py - note: Installing Nextcloud - read-notes-stdout: true - log-stdout: true - log-stderr: true - name: Talk conversation container: gcb-playwright commands: diff --git a/energy-tests/usage_scenario-postgres-talk-firefox.yml b/energy-tests/usage_scenario-postgres-talk-firefox.yml index a9a58014..312b78ed 100644 --- a/energy-tests/usage_scenario-postgres-talk-firefox.yml +++ b/energy-tests/usage_scenario-postgres-talk-firefox.yml @@ -19,15 +19,6 @@ services: DISPLAY: ":0" # for debugging in non-headless mode flow: - - name: Install Nextcloud - container: gcb-playwright - commands: - - type: console - command: python3 /tmp/repo/energy-tests/nextcloud_install.py firefox - note: Installing Nextcloud - read-notes-stdout: true - log-stdout: true - log-stderr: true - name: Talk conversation container: gcb-playwright commands: diff --git a/energy-tests/usage_scenario-sqlite-docs-chromium.yml b/energy-tests/usage_scenario-sqlite-docs-chromium.yml index c19b6346..860e0380 100644 --- a/energy-tests/usage_scenario-sqlite-docs-chromium.yml +++ b/energy-tests/usage_scenario-sqlite-docs-chromium.yml @@ -19,15 +19,6 @@ services: DISPLAY: ":0" # for debugging in non-headless mode flow: - - name: Install Nextcloud - container: gcb-playwright - commands: - - type: console - command: python3 /tmp/repo/energy-tests/nextcloud_install.py - note: Installing Nextcloud - read-notes-stdout: true - log-stdout: true - log-stderr: true - name: Create User container: gcb-playwright commands: diff --git a/energy-tests/usage_scenario-sqlite-docs-firefox.yml b/energy-tests/usage_scenario-sqlite-docs-firefox.yml index d5baa86a..756d2039 100644 --- a/energy-tests/usage_scenario-sqlite-docs-firefox.yml +++ b/energy-tests/usage_scenario-sqlite-docs-firefox.yml @@ -19,15 +19,6 @@ services: DISPLAY: ":0" # for debugging in non-headless mode flow: - - name: Install Nextcloud - container: gcb-playwright - commands: - - type: console - command: python3 /tmp/repo/energy-tests/nextcloud_install.py firefox - note: Installing Nextcloud - read-notes-stdout: true - log-stdout: true - log-stderr: true - name: Create User container: gcb-playwright commands: diff --git a/energy-tests/usage_scenario-sqlite-event-chromium.yml b/energy-tests/usage_scenario-sqlite-event-chromium.yml index 5fd6b6ea..697d2bc4 100644 --- a/energy-tests/usage_scenario-sqlite-event-chromium.yml +++ b/energy-tests/usage_scenario-sqlite-event-chromium.yml @@ -16,15 +16,6 @@ services: DISPLAY: ":0" # for debugging in non-headless mode flow: - - name: Install Nextcloud - container: gcb-playwright - commands: - - type: console - command: python3 /tmp/repo/energy-tests/nextcloud_install.py - note: Installing Nextcloud - read-notes-stdout: true - log-stdout: true - log-stderr: true - name: Login and create event container: gcb-playwright commands: diff --git a/energy-tests/usage_scenario-sqlite-event-firefox.yml b/energy-tests/usage_scenario-sqlite-event-firefox.yml index af2da586..0dbc728e 100644 --- a/energy-tests/usage_scenario-sqlite-event-firefox.yml +++ b/energy-tests/usage_scenario-sqlite-event-firefox.yml @@ -16,15 +16,6 @@ services: DISPLAY: ":0" # for debugging in non-headless mode flow: - - name: Install Nextcloud - container: gcb-playwright - commands: - - type: console - command: python3 /tmp/repo/energy-tests/nextcloud_install.py firefox - note: Installing Nextcloud - read-notes-stdout: true - log-stdout: true - log-stderr: true - name: Login and create event container: gcb-playwright commands: diff --git a/energy-tests/usage_scenario-sqlite-install-firefox.yml b/energy-tests/usage_scenario-sqlite-install-firefox.yml new file mode 100644 index 00000000..38844521 --- /dev/null +++ b/energy-tests/usage_scenario-sqlite-install-firefox.yml @@ -0,0 +1,27 @@ +--- +name: Nextcloud - SQLite - Install - Firefox +author: Arne Tarara +description: Installs the official Nextcloud image with a SQLite DB. +compose-file: !include compose-sqlite.yml + +services: + gcb-playwright: + image: greencoding/gcb_playwright:v12 + depends_on: + nc: + condition: service_healthy +# volumes: +# - /tmp/.X11-unix:/tmp/.X11-unix # for debugging in non-headless mode + environment: + DISPLAY: ":0" # for debugging in non-headless mode + +flow: + - name: Install Nextcloud + container: gcb-playwright + commands: + - type: console + command: python3 /tmp/repo/energy-tests/nextcloud_install.py + note: Installing Nextcloud + read-notes-stdout: true + log-stdout: true + log-stderr: true diff --git a/energy-tests/usage_scenario-sqlite-talk-chromium.yml b/energy-tests/usage_scenario-sqlite-talk-chromium.yml index 8060f6fe..812df402 100644 --- a/energy-tests/usage_scenario-sqlite-talk-chromium.yml +++ b/energy-tests/usage_scenario-sqlite-talk-chromium.yml @@ -19,15 +19,6 @@ services: DISPLAY: ":0" # for debugging in non-headless mode flow: - - name: Install Nextcloud - container: gcb-playwright - commands: - - type: console - command: python3 /tmp/repo/energy-tests/nextcloud_install.py - note: Installing Nextcloud - read-notes-stdout: true - log-stdout: true - log-stderr: true - name: Talk conversation container: gcb-playwright commands: diff --git a/energy-tests/usage_scenario-sqlite-talk-firefox.yml b/energy-tests/usage_scenario-sqlite-talk-firefox.yml index d075cdec..21ca8386 100644 --- a/energy-tests/usage_scenario-sqlite-talk-firefox.yml +++ b/energy-tests/usage_scenario-sqlite-talk-firefox.yml @@ -19,15 +19,6 @@ services: DISPLAY: ":0" # for debugging in non-headless mode flow: - - name: Install Nextcloud - container: gcb-playwright - commands: - - type: console - command: python3 /tmp/repo/energy-tests/nextcloud_install.py firefox - note: Installing Nextcloud - read-notes-stdout: true - log-stdout: true - log-stderr: true - name: Talk conversation container: gcb-playwright commands: