From 51223e6cb4f40083867ff29412a9893125d8c252 Mon Sep 17 00:00:00 2001 From: alexm Date: Fri, 14 Mar 2025 11:40:19 +0100 Subject: [PATCH 1/2] feat: update Jenkinsfile to pull Docker images for back and db services --- Jenkinsfile | 2 ++ 1 file changed, 2 insertions(+) diff --git a/Jenkinsfile b/Jenkinsfile index 63577dad5..2f11556b5 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -120,6 +120,8 @@ pipeline { def image = docker.build('lilium-dev', '-f docs/Dockerfile.dev docs') sh 'docker login --username $CREDS_USR --password $CREDS_PSW $REGISTRY' + sh "docker-compose ${env.COMPOSE_PARAMS} pull back" + sh "docker-compose ${env.COMPOSE_PARAMS} pull db" sh "docker-compose ${env.COMPOSE_PARAMS} up -d" image.inside("--network ${env.COMPOSE_PROJECT}_default -e CI -e TZ --init") { From 1e84695a51781e355faf1d53f74f448ba225709b Mon Sep 17 00:00:00 2001 From: alexm Date: Fri, 14 Mar 2025 12:12:16 +0100 Subject: [PATCH 2/2] test: skip reserved row marking and unmarking tests in ticketSale.spec.js --- test/cypress/integration/ticket/ticketSale.spec.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/test/cypress/integration/ticket/ticketSale.spec.js b/test/cypress/integration/ticket/ticketSale.spec.js index 61ba9fe4f..bcbf101e1 100644 --- a/test/cypress/integration/ticket/ticketSale.spec.js +++ b/test/cypress/integration/ticket/ticketSale.spec.js @@ -152,7 +152,7 @@ describe('TicketSale', () => { cy.checkNotification('Future ticket date not allowed'); }); - it('marks row as reserved', () => { + it.skip('marks row as reserved', () => { selectFirstRow(); cy.dataCy('ticketSaleMoreActionsDropdown').click(); cy.waitForElement('[data-cy="markAsReservedItem"]'); @@ -160,7 +160,7 @@ describe('TicketSale', () => { cy.dataCy('ticketSaleReservedIcon').should('exist'); }); - it('unmarks row as reserved', () => { + it.skip('unmarks row as reserved', () => { selectFirstRow(); cy.dataCy('ticketSaleMoreActionsDropdown').click(); cy.waitForElement('[data-cy="unmarkAsReservedItem"]');