From 2eb1f1a47ae99fa3d0761e0ed0e60be86f1c4ed6 Mon Sep 17 00:00:00 2001
From: Timo <timo@devplant.ro>
Date: Tue, 4 May 2021 15:09:54 +0300
Subject: [PATCH] debug info

---
 .../src/main/java/buildjob/PlanSpec.java      | 74 +++++++------------
 1 file changed, 25 insertions(+), 49 deletions(-)

diff --git a/bamboo-specs/src/main/java/buildjob/PlanSpec.java b/bamboo-specs/src/main/java/buildjob/PlanSpec.java
index 4323521b0..ca795c7e7 100644
--- a/bamboo-specs/src/main/java/buildjob/PlanSpec.java
+++ b/bamboo-specs/src/main/java/buildjob/PlanSpec.java
@@ -93,70 +93,46 @@ public class PlanSpec {
         return new Job("Upstream Push", new BambooKey("USPSH"))
             .tasks(
                 new VcsCheckoutTask().description("Checkout Default Repository")
-                    .checkoutItems(new CheckoutItem().defaultRepository()), new ScriptTask().description("Build")
+                    .checkoutItems(new CheckoutItem().defaultRepository()),
+
+                // update versions
+                new ScriptTask().description("Build")
                     .location(ScriptTaskProperties.Location.FILE)
                     .fileFromPath("bamboo-specs/src/main/resources/scripts/update-version.sh")
                     .environmentVariables("BRANCH_NAME=\"${bamboo.planRepository.branchName}\""),
-                new VcsCommitTask().commitMessage("chore(release)").repository("RED / ui"))
+
+                // create version.properties file
+                new ScriptTask().description("Set Version Properties")
+                    .location(ScriptTaskProperties.Location.FILE)
+                    .fileFromPath("bamboo-specs/src/main/resources/scripts/set-version.properties.sh")
+                    .environmentVariables("BRANCH_NAME=\"${bamboo.planRepository.branchName}\""),
+
+                // commit release
+                new VcsCommitTask().commitMessage("chore(release)").repository("RED / ui"),
+                // create tag with this version
+                new VcsTagTask().tagName("${bamboo.inject.APP_VERSION}").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"));
+                .volume("/var/run/docker.sock", "/var/run/docker.sock"))
+
+            // publish artifact with this version
+            .artifacts(new Artifact("version").location(".").copyPattern("**/version.properties").shared(true));
     }
 
 
     public Job createRelease() {
         return new Job("Create Release", new BambooKey("CRLS"))
             .tasks(
-                new VcsCheckoutTask().description("Checkout Default Repository").checkoutItems(new CheckoutItem().defaultRepository()),
-                new ScriptTask().description("Update Versions")
-                    .location(ScriptTaskProperties.Location.FILE)
-                    .fileFromPath("bamboo-specs/src/main/resources/scripts/update-version.sh"),
-                new ScriptTask().description("Set Version Properties")
-                    .location(ScriptTaskProperties.Location.FILE)
-                    .fileFromPath("bamboo-specs/src/main/resources/scripts/set-version.properties.sh")
-                    .environmentVariables("BRANCH_NAME=\"${bamboo.planRepository.branchName}\""),
-                new InjectVariablesTask().path("version.properties"),
+                new VcsCheckoutTask().description("Checkout Default Repository")
+                    .checkoutItems(new CheckoutItem().defaultRepository()).cleanCheckout(true),
+
+                new ScriptTask().inlineBody("ls -la ."),
+                // read version from artifact
+                new InjectVariablesTask().path("${bamboo.build.working.directory}/version/version.properties"),
                 new VcsBranchTask().branchName("release/${bamboo.inject.APP_VERSION}").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"));
     }
 
 
-    public Plan createCypressTestPlan() {
-
-        return new Plan(project(), "redaction-ui-cypress-tests", new BambooKey("UITESTS"))
-            .description("Cypress UI tests for redaction-ui.")
-            .stages(new Stage("UI Test Stage").jobs(createCypressJob()))
-            .linkedRepositories("RED / ui").triggers(new BitbucketServerTrigger()).planBranchManagement(
-                new PlanBranchManagement().createForVcsBranch()
-                    .delete(new BranchCleanup().whenInactiveInRepositoryAfterDays(30)).notificationForCommitters());
-    }
-
-
-    private Job createCypressJob() {
-        return new Job("Cypress UI Tests Job", new BambooKey("UITESTSCYPRESS")).tasks(
-            new VcsCheckoutTask().description("Checkout Default Repository")
-                .checkoutItems(new CheckoutItem().defaultRepository()),
-
-            new ScriptTask().description("Build").inlineBody(
-                "#!/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")
-            // for some reason disk isn't synced in real-time from docker
-
-        ).finalTasks(
-            TestParserTask.createJUnitParserTask().description("Cypress Test Results").defaultResultDirectory())
-            .dockerConfiguration(new DockerConfiguration().image("nexus.iqser.com:5001/infra/release_build:2.9.1")
-                .volume("/var/run/docker.sock", "/var/run/docker.sock"))
-            .artifacts(new Artifact("videos").location("./cypress/videos").copyPattern("**/*.mp4").shared(true),
-                new Artifact("screenshots").location("./cypress/screenshots").copyPattern("**/*.png").shared(true));
-    }
 
 }