From 1074167aa98f9f59c0f0f534ba2f1ba09ffb0958 Mon Sep 17 00:00:00 2001
From: Viktor Seifert <viktor.seifert@iqser.com>
Date: Tue, 26 Jul 2022 09:41:21 +0200
Subject: [PATCH] RED-4653: Removed Docker build stage since it is not needed
 for a project that is used as a Python module

---
 .../src/main/java/buildjob/PlanSpec.java      | 30 ++-----------------
 .../main/resources/scripts/docker-build.sh    | 13 --------
 2 files changed, 2 insertions(+), 41 deletions(-)
 delete mode 100755 bamboo-specs/src/main/resources/scripts/docker-build.sh

diff --git a/bamboo-specs/src/main/java/buildjob/PlanSpec.java b/bamboo-specs/src/main/java/buildjob/PlanSpec.java
index 6440aa9..e9c8884 100644
--- a/bamboo-specs/src/main/java/buildjob/PlanSpec.java
+++ b/bamboo-specs/src/main/java/buildjob/PlanSpec.java
@@ -44,7 +44,7 @@ public class PlanSpec {
         //By default credentials are read from the '.credentials' file.
         BambooServer bambooServer = new BambooServer("http://localhost:8085");
 
-        Plan plan = new PlanSpec().createDockerBuildPlan();
+        Plan plan = new PlanSpec().createBuildPlan();
         bambooServer.publish(plan);
         PlanPermissions planPermission = new PlanSpec().createPlanPermission(plan.getIdentifier());
         bambooServer.publish(planPermission);
@@ -67,38 +67,12 @@ public class PlanSpec {
                 .key(new BambooKey("RED"));
     }
 
-    public Plan createDockerBuildPlan() {
+    public Plan createBuildPlan() {
     return new Plan(
             project(),
             SERVICE_NAME, new BambooKey(SERVICE_KEY))
             .description("Docker build for pyinfra")
             .stages(
-             new Stage("Build Stage")
-              .jobs(
-                new Job("Build Job", new BambooKey("BUILD"))
-                  .tasks(
-                    new CleanWorkingDirectoryTask()
-                        .description("Clean working directory.")
-                        .enabled(true),
-                    new VcsCheckoutTask()
-                        .description("Checkout default repository.")
-                        .checkoutItems(new CheckoutItem().defaultRepository()),
-                    new ScriptTask()
-                        .description("Set config and keys.")
-                        .inlineBody("mkdir -p ~/.ssh\n" +
-                                    "echo \"${bamboo.bamboo_agent_ssh}\" | base64 -d >> ~/.ssh/id_rsa\n" +
-                                    "echo \"host vector.iqser.com\" > ~/.ssh/config\n" +
-                                    "echo \"    user bamboo-agent\" >> ~/.ssh/config\n" +
-                                    "chmod 600 ~/.ssh/config ~/.ssh/id_rsa"),
-                    new ScriptTask()
-                        .description("Build Docker container.")
-                        .location(Location.FILE)
-                        .fileFromPath("bamboo-specs/src/main/resources/scripts/docker-build.sh")
-                        .argument(SERVICE_NAME))
-                  .dockerConfiguration(
-                      new DockerConfiguration()
-                        .image("nexus.iqser.com:5001/infra/release_build:4.2.0")
-                        .volume("/var/run/docker.sock", "/var/run/docker.sock"))),
             new Stage("Sonar Stage")
               .jobs(
                 new Job("Sonar Job", new BambooKey("SONAR"))
diff --git a/bamboo-specs/src/main/resources/scripts/docker-build.sh b/bamboo-specs/src/main/resources/scripts/docker-build.sh
deleted file mode 100755
index bce07f2..0000000
--- a/bamboo-specs/src/main/resources/scripts/docker-build.sh
+++ /dev/null
@@ -1,13 +0,0 @@
-#!/bin/bash
-set -e
-
-SERVICE_NAME=$1
-
-python3 -m venv build_venv
-source build_venv/bin/activate
-python3 -m pip install --upgrade pip
-
-echo "index-url = https://${bamboo_nexus_user}:${bamboo_nexus_password}@nexus.iqser.com/repository/python-combind/simple" >> pip.conf
-docker build -f Dockerfile  -t nexus.iqser.com:5001/red/$SERVICE_NAME:${bamboo_version_tag} .
-echo "${bamboo_nexus_password}" | docker login --username "${bamboo_nexus_user}" --password-stdin nexus.iqser.com:5001
-docker push nexus.iqser.com:5001/red/$SERVICE_NAME:${bamboo_version_tag}