diff --git a/Jenkinsfile b/Jenkinsfile index 2623230..46d891f 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -83,68 +83,13 @@ spec: } } } - /* - stage('Make jar') { - steps { - script { - buildJar(true) - } - } - } - stage('Package helm chart') { - steps { - script { - makeHelmChart("json-echo-helm-chart/json-echo") - } - } - } - stage('Upload helm chart') { - steps { - script { - uploadHelmChart("json-echo-1.0.0-SNAPSHOT.tgz", env.NEXUS_URL, "admin", env.NEXUS_PASS) - } - } - } - stage('Docker build & push') { - steps { - script { - customDockerBuildAndPush(env.NEXUS_DOCKER_URL, "json-echo", "./Dockerfile", "target", "admin", env.NEXUS_DOCKER_PASS) - } - } - } - stage('Add Helm Repo') { - steps { - script { - addHelmRepo("my-helm-repo", env.NEXUS_URL) - } - } - } - stage('Deploy Helm Chart') { - steps { - script { - deployHelm( - "json-echo", - "my-helm-repo", - "json-echo", - "1.0.0-SNAPSHOT", - env.KUBERNETES_API, - env.KUBERNETES_TOKEN, - ["app.image": "localhost:31050/my-docker-repo/json-echo:latest", "app.ports.http": 8090, "app.secret": "nexus-secret"] - ) - } - } - } - */ - stage('Build and Deploy') { + stage('Build and Deploy') { steps { script { buildAndDeploy("json-echo", "json-echo-helm-chart", "my-helm-repo", "1.0.0-SNAPSHOT", "customDockerBuildAndPush") } } } - - - } post { success {