Bugfix/#1751 openshift docker s2i (#1753)

* WIP: Code implementation completed

* Refactored affected tests and included new test cases

* Added changelog entry

* Changelog typo

CHANGELOG.md

@@ -15,6 +15,7 @@ After this we will switch probably to real [Semantic Versioning 2.0.0](http://se
 * Feature #1748: Quarkus generator: Extract base image from configuration.
 * Fix #1695: IllegalArgumentException when Spring Boot application.yaml contains integer keys
 * Fix #797: spring-boot generator can not handle multi-profile configuration
+* Fix #1751: Build Names are suffixed with -*s2i regardless of build strategy
 
 ### 4.3.1 (18-10-2019)
 * Updated Kubernetes client to 4.6.1

core/src/main/java/io/fabric8/maven/core/service/openshift/OpenshiftBuildService.java

@@ -83,6 +83,8 @@
  */
 public class OpenshiftBuildService implements BuildService {
 
+    private static final String DEFAULT_S2I_BUILD_SUFFIX = "-s2i";
+
     private final OpenShiftClient client;
     private final Logger log;
     private ServiceHub dockerServiceHub;
@@ -309,7 +311,7 @@ private BuildStrategy createBuildStrategy(ImageConfiguration imageConfig, OpenSh
                     .withNoCache(checkForNocache(imageConfig))
                     .withEnv(checkForEnv(imageConfig))
                     .endDockerStrategy().build();
-            
+
             if (openshiftPullSecret != null) {
                 buildStrategy.getDockerStrategy().setPullSecret(new LocalObjectReferenceBuilder()
                 .withName(openshiftPullSecret)
@@ -698,7 +700,13 @@ private void addImageStreamToFile(File imageStreamFile, ImageName imageName, Ope
     // == Utility methods ==========================
 
     private String getS2IBuildName(BuildServiceConfig config, ImageName imageName) {
-        return imageName.getSimpleName() + config.getS2iBuildNameSuffix();
+        final StringBuilder s2IBuildName = new StringBuilder(imageName.getSimpleName());
+        if (!StringUtils.isEmpty(config.getS2iBuildNameSuffix())) {
+            s2IBuildName.append(config.getS2iBuildNameSuffix());
+        } else if (config.getOpenshiftBuildStrategy() == OpenShiftBuildStrategy.s2i) {
+            s2IBuildName.append(DEFAULT_S2I_BUILD_SUFFIX);
+        }
+        return s2IBuildName.toString();
     }
 
     private String getImageStreamName(ImageName name) {