Skip to content
This repository has been archived by the owner on Jun 26, 2023. It is now read-only.

Commit

Permalink
Upgrade e2e test dependencies
Browse files Browse the repository at this point in the history
- jsonnet to 18
- cypress to 10.9
- grafana to 9.1.7
  • Loading branch information
rhowe committed Oct 9, 2022
1 parent 3028019 commit 2967f3e
Show file tree
Hide file tree
Showing 11 changed files with 2,401 additions and 906 deletions.
8 changes: 5 additions & 3 deletions Makefile
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
UID = $(shell id -u $(USER))
GID = $(shell id -g $(USER))

JSONNET_VERSION ?= 0.18.0

help: # Show this message.
@echo "\nAvailable Targets:\n"
@sed -ne '/@sed/!s/# //p' $(MAKEFILE_LIST)
Expand All @@ -11,7 +13,7 @@ test: # Run all unit tests.
-v $$PWD:$$PWD \
-u $(UID):$(GID) \
--entrypoint bash \
bitnami/jsonnet:0.16.0 \
bitnami/jsonnet:$(JSONNET_VERSION) \
tests.sh

test-update: # Run all unit tests while copying test_output.json to compiled.json file.
Expand All @@ -20,10 +22,10 @@ test-update: # Run all unit tests while copying test_output.json to compiled.js
-v $$PWD:$$PWD \
-u $(UID):$(GID) \
--entrypoint bash \
bitnami/jsonnet:0.16.0 \
bitnami/jsonnet:$(JSONNET_VERSION) \
tests.sh update

E2E_GRAFANA_VERSION ?= 7.1.1
E2E_GRAFANA_VERSION ?= 9.1.7

e2e: # Run all end-to-end tests.
GRAFANA_VERSION=${E2E_GRAFANA_VERSION} \
Expand Down
6 changes: 6 additions & 0 deletions e2e/cypress.config.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
const { defineConfig } = require('cypress')

module.exports = defineConfig({
e2e: { }
})

2 changes: 0 additions & 2 deletions e2e/cypress.json

This file was deleted.

File renamed without changes.
2 changes: 1 addition & 1 deletion e2e/docker-compose.dev.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ services:
build:
context: .
args:
CYPRESS_IMAGE: cypress/included:4.7.0
CYPRESS_IMAGE: cypress/included:10.9.0
image: grafonnet-e2e-dev
entrypoint: cypress open --project .
depends_on:
Expand Down
4 changes: 2 additions & 2 deletions e2e/docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ services:
build:
context: .
args:
CYPRESS_IMAGE: cypress/base:12
CYPRESS_IMAGE: cypress/base:16
image: grafonnet-e2e
command: npx cypress run
depends_on:
Expand All @@ -16,5 +16,5 @@ services:
- CYPRESS_video=false
volumes:
- ./cypress:/e2e/cypress
- ./cypress.json:/e2e/cypress.json
- ./cypress.config.js:/e2e/cypress.config.js
- ../tests:/e2e/tests
Loading

0 comments on commit 2967f3e

Please sign in to comment.