From 71708e0d0bfa97bdf3274ddf4e2cca94a890e112 Mon Sep 17 00:00:00 2001
From: Kishan Sagathiya <kishansagathiya@gmail.com>
Date: Tue, 7 Aug 2018 05:16:17 +0530
Subject: [PATCH] Remove content repository related code

Content repository is not being used anywhere. Thus removing any
content repository related code. `mvn` deploy target has been changed
to `install` as we don't want to copy the final package to the remote
repository.

Fixes: https://github.com/openshiftio/openshift.io/issues/3895
---
 vars/canaryRelease.groovy      |  1 -
 vars/contentRepository.groovy  | 28 ----------------------------
 vars/mavenCanaryRelease.groovy |  3 +--
 3 files changed, 1 insertion(+), 31 deletions(-)
 delete mode 100644 vars/contentRepository.groovy

diff --git a/vars/canaryRelease.groovy b/vars/canaryRelease.groovy
index 59e83d14..a6b2555d 100644
--- a/vars/canaryRelease.groovy
+++ b/vars/canaryRelease.groovy
@@ -63,5 +63,4 @@ def call(body) {
         }
     }
 
-    contentRepository(body);
 }
diff --git a/vars/contentRepository.groovy b/vars/contentRepository.groovy
deleted file mode 100644
index eccd3636..00000000
--- a/vars/contentRepository.groovy
+++ /dev/null
@@ -1,28 +0,0 @@
-#!/usr/bin/groovy
-
-def call(body) {
-    // evaluate the body block, and collect configuration into the object
-    def config = [:]
-    body.delegate = config
-    body()
-    def serviceName = config.serviceName ?: "content-repository";
-    def useContentRepository = config.useContentRepository ?: "true"
-
-
-    if (useContentRepository) {
-        def flow = new io.fabric8.Fabric8Commands()
-        echo "Checking ${serviceName} exists"
-        if (flow.hasService(serviceName)) {
-            try {
-                //sh 'mvn site site:deploy'
-                echo 'mvn site disabled'
-            } catch (err) {
-                // lets carry on as maven site isn't critical
-                echo 'unable to generate maven site'
-            }
-
-        } else {
-            echo 'no content-repository service so not deploying the maven site report'
-        }
-    }
-}
diff --git a/vars/mavenCanaryRelease.groovy b/vars/mavenCanaryRelease.groovy
index 2d150a15..a3de8a4c 100644
--- a/vars/mavenCanaryRelease.groovy
+++ b/vars/mavenCanaryRelease.groovy
@@ -55,7 +55,7 @@ def call(body) {
         }
     }
 
-    sh "mvn clean -B -e -U deploy -Dmaven.test.skip=${skipTests} ${spaceLabelArg} -P openshift"
+    sh "mvn clean -B -e -U install -Dmaven.test.skip=${skipTests} ${spaceLabelArg} -P openshift"
 
 
     junitResults(body);
@@ -95,7 +95,6 @@ def call(body) {
         }
     }
 
-    contentRepository(body);
 }
 
 def patchFMPVersion() {