fixed name

This commit is contained in:
Timo Bejan 2020-11-10 11:25:34 +02:00
parent d662ffc03c
commit c396bed2aa
2 changed files with 14 additions and 6 deletions

View File

@ -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(

View File

@ -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');