Merge pull request #48 from jenkins-x-apps/jacoco-app-move

Move to apps org and new repo.  Updated all references.

Dockerfile

@@ -1,5 +1,5 @@
 FROM scratch
 EXPOSE 8080
-ENTRYPOINT ["/ext-jacoco"]
+ENTRYPOINT ["/jx-app-jacoco"]
 COPY ./tmp/ca-certificates.crt /etc/ssl/certs/
 COPY ./bin/ /

Jenkinsfile

@@ -2,8 +2,8 @@ pipeline {
     agent any
     environment {
       ORG               = 'jenkinsxio'
-      GITHUB_ORG        = 'jenkins-x'
-      APP_NAME          = 'ext-jacoco'
+      GITHUB_ORG        = 'jenkins-x-apps'
+      APP_NAME          = 'jx-app-jacoco'
       GIT_PROVIDER      = 'github.com'
       CHARTMUSEUM_CREDS = credentials('jenkins-x-chartmuseum')
     }
@@ -18,7 +18,7 @@ pipeline {
           HELM_RELEASE = "$PREVIEW_NAMESPACE".toLowerCase()
         }
         steps {
-          dir ('/home/jenkins/go/src/github.com/jenkins-x/ext-jacoco') {
+          dir ('/home/jenkins/go/src/github.com/jenkins-x-apps/jx-app-jacoco') {
             checkout scm
             sh "make linux"
             sh 'export VERSION=$PREVIEW_VERSION && make skaffold-build'
@@ -32,25 +32,25 @@ pipeline {
           branch 'master'
         }
         steps {
-          dir ('/home/jenkins/go/src/github.com/jenkins-x/ext-jacoco') {
-            git 'https://github.com/jenkins-x/ext-jacoco'
+          dir ('/home/jenkins/go/src/github.com/jenkins-x-apps/jx-app-jacoco') {
+            git 'https://github.com/jenkins-x-apps/jx-app-jacoco'
           }
-          dir ('/home/jenkins/go/src/github.com/jenkins-x/ext-jacoco/charts/ext-jacoco') {
+          dir ('/home/jenkins/go/src/github.com/jenkins-x-apps/jx-app-jacoco/charts/jx-app-jacoco') {
               // ensure we're not on a detached head
               sh "git checkout master"
               // until we switch to the new kubernetes / jenkins credential implementation use git credentials store
               sh "git config --global credential.helper store"
 
               sh "jx step git credentials"
           }
-          dir ('/home/jenkins/go/src/github.com/jenkins-x/ext-jacoco') {
+          dir ('/home/jenkins/go/src/github.com/jenkins-x-apps/jx-app-jacoco') {
             // so we can retrieve the version in later steps
             sh "echo \$(jx-release-version) > VERSION"
           }
-          dir ('/home/jenkins/go/src/github.com/jenkins-x/ext-jacoco/charts/ext-jacoco') {
+          dir ('/home/jenkins/go/src/github.com/jenkins-x-apps/jx-app-jacoco/charts/jx-app-jacoco') {
             sh "make tag"
           }
-          dir ('/home/jenkins/go/src/github.com/jenkins-x/ext-jacoco') {
+          dir ('/home/jenkins/go/src/github.com/jenkins-x-apps/jx-app-jacoco') {
             sh "make build"
             sh 'export VERSION=`cat VERSION` && make skaffold-build'
             sh "jx step post build --image $DOCKER_REGISTRY/$ORG/$APP_NAME:\$(cat VERSION)"
@@ -62,13 +62,13 @@ pipeline {
           branch 'master'
         }
         steps {
-          dir ('/home/jenkins/go/src/github.com/jenkins-x/ext-jacoco/charts/ext-jacoco') {
+          dir ('/home/jenkins/go/src/github.com/jenkins-x-apps/jx-app-jacoco/charts/jx-app-jacoco') {
             sh 'jx step changelog --version v\$(cat ../../VERSION)'
 
             // release the helm chart
             sh 'jx step helm release'
           }
-          dir ('/home/jenkins/go/src/github.com/jenkins-x/ext-jacoco') {
+          dir ('/home/jenkins/go/src/github.com/jenkins-x-apps/jx-app-jacoco') {
             // release the docker image
             sh 'docker build -t docker.io/$ORG/$APP_NAME:\$(cat VERSION) .'
             sh 'docker push docker.io/$ORG/$APP_NAME:\$(cat VERSION)'

Makefile

@@ -1,6 +1,6 @@
 SHELL := /bin/bash
 GO := GO111MODULE=on GO15VENDOREXPERIMENT=1 go
-NAME := ext-jacoco
+NAME := jx-app-jacoco
 OS := $(shell uname)
 MAIN_GO := main.go
 ROOT_PACKAGE := $(GIT_PROVIDER)/$(ORG)/$(NAME)

README.md

@@ -1 +1 @@
-# ext-jacoco
+# jx-app-jacoco

charts/ext-jacoco/Chart.yaml → charts/jx-app-jacoco/Chart.yaml

@@ -1,5 +1,5 @@
 apiVersion: v1
 description: A Helm chart for Kubernetes
 icon: https://raw.githubusercontent.com/jenkins-x/jenkins-x-platform/d273e09/images/go.png
-name: ext-jacoco
+name: jx-app-jacoco
 version: 0.1.0-SNAPSHOT

charts/ext-jacoco/Makefile → charts/jx-app-jacoco/Makefile

@@ -1,6 +1,6 @@
 CHART_REPO := http://jenkins-x-chartmuseum:8080
 CURRENT=$(pwd)
-NAME := ext-jacoco
+NAME := jx-app-jacoco
 OS := $(shell uname)
 VERSION := $(shell cat ../../VERSION)
 

charts/ext-jacoco/values.yaml → charts/jx-app-jacoco/values.yaml

@@ -3,11 +3,11 @@
 # Declare variables to be passed into your templates.
 replicaCount: 1
 image:
-  repository: jenkinsxio/ext-jacoco
+  repository: jenkinsxio/jx-app-jacoco
   tag: dev
   pullPolicy: IfNotPresent
 service:
-  name: ext-jacoco
+  name: jx-app-jacoco
   type: ClusterIP
   externalPort: 80
   internalPort: 8080

charts/preview/Makefile

@@ -8,7 +8,7 @@ ifeq ($(OS),Darwin)
 else ifeq ($(OS),Linux)
 	sed -i -e "s/version:.*/version: $(PREVIEW_VERSION)/" Chart.yaml
 	sed -i -e "s/version:.*/version: $(PREVIEW_VERSION)/" ../*/Chart.yaml
-	sed -i -e "s|repository: .*|repository: $(DOCKER_REGISTRY)\/jenkins-x\/ext-jacoco|" values.yaml
+	sed -i -e "s|repository: .*|repository: $(DOCKER_REGISTRY)\/jenkins-x-apps\/jx-app-jacoco|" values.yaml
 	sed -i -e "s/tag: .*/tag: $(PREVIEW_VERSION)/" values.yaml
 else
 	echo "platfrom $(OS) not supported to release from"

charts/preview/requirements.yaml

@@ -9,5 +9,5 @@ dependencies:
   repository: https://chartmuseum.build.cd.jenkins-x.io
   version: 2.3.56
 - alias: preview
-  name: ext-jacoco
-  repository: file://../ext-jacoco
+  name: jx-app-jacoco
+  repository: file://../jx-app-jacoco

go.mod

@@ -1,15 +1,10 @@
-module github.com/jenkins-x/ext-jacoco
+module github.com/jenkins-x-apps/jx-app-jacoco
 
 require (
-	github.com/davecgh/go-spew v1.1.1 // indirect
 	github.com/hashicorp/go-retryablehttp v0.5.0
-	github.com/hashicorp/golang-lru v0.5.0 // indirect
+	github.com/jenkins-x/ext-jacoco v0.0.82
 	github.com/jenkins-x/jx v1.3.445
-	github.com/json-iterator/go v1.1.5 // indirect
-	github.com/ogier/pflag v0.0.1 // indirect
 	github.com/pkg/errors v0.8.0
-	golang.org/x/crypto v0.0.0-20181015023909-0c41d7ab0a0e // indirect
-	golang.org/x/net v0.0.0-20181011144130-49bb7cea24b1 // indirect
 	k8s.io/api v0.0.0-20180628040859-072894a440bd
 	k8s.io/apiextensions-apiserver v0.0.0-20180621085152-bbc52469f98b
 	k8s.io/apimachinery v0.0.0-20180621070125-103fd098999d

go.sum

@@ -100,6 +100,8 @@ github.com/jbenet/go-context v0.0.0-20150711004518-d14ea06fba99/go.mod h1:1lJo3i
 github.com/jbrukh/bayesian v0.0.0-20161210175230-bf3f261f9a9c/go.mod h1:SELxwZQq/mPnfPCR2mchLmT4TQaPJvYtLcCtDWSM7vM=
 github.com/jenkins-x/chyle v0.0.0-20180226080600-68f7a93a63ec/go.mod h1:3fkKXAgJpGvLAD+9v2cPUTSSLzO7of4/VkwgpEJSkXQ=
 github.com/jenkins-x/draft-repo v0.0.0-20180417100212-2f66cc518135/go.mod h1:K/L25ViEpDx196rOZyjn433tAM5zr2F/IouK+3g+DkE=
+github.com/jenkins-x/ext-jacoco v0.0.82 h1:s7flRGXixxA1ngC6a/wjYmLI85ciLh5IRDjJ1AolSqY=
+github.com/jenkins-x/ext-jacoco v0.0.82/go.mod h1:pxo3I8Oka0DuN1XcF/7cYX4V9z5SZo1Wj5i0G/EkAiw=
 github.com/jenkins-x/golang-jenkins v0.0.0-20180919102630-65b83ad42314/go.mod h1:C6j5HgwlHGjRU27W4XCs6jXksqYFo8OdBu+p44jqQeM=
 github.com/jenkins-x/jx v1.3.445 h1:/t/9jGfgVOqh2faq86rujJ9YiO9xP0EJuzUaJupvfj8=
 github.com/jenkins-x/jx v1.3.445/go.mod h1:c1MVnAxABOX1I+URmJDQfJvG4RZMZ4WmNiyJa+Tkw+o=

jacoco_analyzer_install.sh

@@ -1,3 +1,3 @@
 #!/bin/sh
-NAME=ext-jacoco
+NAME=jx-app-jacoco
 helm install --repo ${JX_JACOCO_ANALYZER_INSTALL_CHART_REPOSITORY} ${NAME} --version ${EXT_VERSION} --set teamNamespace=${EXT_TEAM_NAMESPACE} --name=${NAME}

jacoco_analyzer_uninstall.sh

@@ -1,3 +1,3 @@
 #!/bin/sh
-NAME=ext-jacoco
+NAME=jx-app-jacoco
 helm del --purge ${NAME}

jacoco_analyzer_upgrade.sh

@@ -1,3 +1,3 @@
 #!/bin/sh
-NAME=ext-jacoco
+NAME=jx-app-jacoco
 helm upgrade ${NAME} --repo ${JX_JACOCO_ANALYZER_UPGRADE_CHART_REPOSITORY} ${NAME} --version ${EXT_VERSION} --set teamNamespace=${EXT_TEAM_NAMESPACE}

main.go

@@ -11,7 +11,7 @@ import (
 	"time"
 
 	"github.com/hashicorp/go-retryablehttp"
-	"github.com/jenkins-x/ext-jacoco/jacoco"
+	"github.com/jenkins-x-apps/jx-app-jacoco/jacoco"
 	"github.com/jenkins-x/jx/pkg/kube"
 	"k8s.io/apimachinery/pkg/fields"
 	"k8s.io/client-go/tools/cache"

skaffold.yaml

@@ -3,7 +3,7 @@ kind: Config
 build:
   tagPolicy:
     envTemplate:
-      template: "{{.DOCKER_REGISTRY}}/jenkins-x/ext-jacoco:{{.VERSION}}"
+      template: "{{.DOCKER_REGISTRY}}/jenkins-x-apps/jx-app-jacoco:{{.VERSION}}"
   artifacts:
   - imageName: changeme
     workspace: .
@@ -17,15 +17,15 @@ profiles:
   build:
     tagPolicy:
       envTemplate:
-        template: "{{.DOCKER_REGISTRY}}/jenkins-x/ext-jacoco:{{.DIGEST_HEX}}"
+        template: "{{.DOCKER_REGISTRY}}/jenkins-x-apps/jx-app-jacoco:{{.DIGEST_HEX}}"
     artifacts:
     - docker: {}
     local: {}
   deploy:
     helm:
       releases:
-      - name: ext-jacoco
-        chartPath: charts/ext-jacoco
+      - name: jx-app-jacoco
+        chartPath: charts/jx-app-jacoco
         setValueTemplates:
-          image.repository: "{{.DOCKER_REGISTRY}}/jenkins-x/ext-jacoco"
+          image.repository: "{{.DOCKER_REGISTRY}}/jenkins-x-apps/jx-app-jacoco"
           image.tag: "{{.DIGEST_HEX}}"