From c396bed2aa20c748a05012542579d502dcb1a772 Mon Sep 17 00:00:00 2001 From: Timo Bejan Date: Tue, 10 Nov 2020 11:25:34 +0200 Subject: [PATCH] fixed name --- .../src/main/java/buildjob/PlanSpec.java | 18 +++++++++++++----- cypress/support/commands.js | 2 +- 2 files changed, 14 insertions(+), 6 deletions(-) diff --git a/bamboo-specs/src/main/java/buildjob/PlanSpec.java b/bamboo-specs/src/main/java/buildjob/PlanSpec.java index 0b61da4c0..9b9c0ccec 100644 --- a/bamboo-specs/src/main/java/buildjob/PlanSpec.java +++ b/bamboo-specs/src/main/java/buildjob/PlanSpec.java @@ -97,8 +97,11 @@ public class PlanSpec { new VcsCheckoutTask().description("Checkout Default Repository") .checkoutItems(new CheckoutItem().defaultRepository()), new ScriptTask().description("Build") .inlineBody( - "#!/bin/bash\n" + "set -e\n" + "if [[ \"${bamboo.planRepository.branchName}\" == \"master\" ]]\n" - + "then\n" + " ./versions.sh patch\n" + "fi\n"), + "#!/bin/bash\n" + + "set -e\n" + + "if [[ \"${bamboo.planRepository.branchName}\" == \"master\" ]]\n" + + "then\n" + + " ./versions.sh patch\n" + "fi\n"), new VcsCommitTask().commitMessage("chore(release)").repository("RED / ui")).dockerConfiguration( new DockerConfiguration().image("nexus.iqser.com:5001/infra/release_build:2.9.1") .volume("/var/run/docker.sock", "/var/run/docker.sock")); @@ -122,12 +125,17 @@ public class PlanSpec { .checkoutItems(new CheckoutItem().defaultRepository()), new ScriptTask().description("Build").inlineBody( - "#!/bin/bash\n" + "set -e\n" + "imageName=\"nexus.iqser.com:5001/red/ui-cypress\"\n" + "#!/bin/bash\n" + + "set -e\n" + + "imageName=\"nexus.iqser.com:5001/red/ui-cypress\"\n" + "dockerfileLocation=\"docker/cypress/Dockerfile\"\n" + "docker build -t ${imageName}:latest -f ${dockerfileLocation} .\n"), new ScriptTask().description("Run Tests").inlineBody( - "#!/bin/bash\n" + "set -e\n" + "imageName=\"nexus.iqser.com:5001/red/ui-cypress\"\n" - + "docker run -v $PWD:/e2e -w /e2e ${imageName}:latest\n" + "sleep 10") + "#!/bin/bash\n" + + "set -e\n" + + "imageName=\"nexus.iqser.com:5001/red/ui-cypress\"\n" + + "docker run -v $PWD:/e2e -w /e2e ${imageName}:latest\n" + + "sleep 10") // for some reason disk isn't synced in real-time from docker ).finalTasks( diff --git a/cypress/support/commands.js b/cypress/support/commands.js index aa5337a59..0e91187b1 100644 --- a/cypress/support/commands.js +++ b/cypress/support/commands.js @@ -9,7 +9,7 @@ Cypress.Commands.add('cleanup', () => { }); Cypress.Commands.add('init', (user) => { - cy.kcLogin('MANAGER').as('tokens'); + cy.kcLogin('manager').as('tokens'); cy.deleteAllProjects(); cy.kcLogout(); cy.kcLogin(user).as('tokens');