Merge pull request #16 from jenkins-x/pr-707c713f-3180-4930-8714-0f4f…

…db26e21c chore: upgrade pipelines
jenkins-x · Dec 4, 2020 · f5cd862 · f5cd862
2 parents bb14fe3 + c8bef6d
commit f5cd862
Show file tree

Hide file tree

Showing 3 changed files with 34 additions and 29 deletions.
diff --git a/.lighthouse/jenkins-x/Kptfile b/.lighthouse/jenkins-x/Kptfile
@@ -1,11 +1,11 @@
 apiVersion: kpt.dev/v1alpha1
 kind: Kptfile
 metadata:
-    name: jenkins-x
+  name: jenkins-x
 upstream:
-    type: git
-    git:
-        commit: 7907c1d03f21b2ba2180bd78e64d1941e999a212
-        repo: https://github.com/jenkins-x/jx3-pipeline-catalog
-        directory: /packs/go-plugin/.lighthouse/jenkins-x
-        ref: master
+  type: git
+  git:
+    commit: 95923d9093f49b0abc4cb65cbb0933af8f48e040
+    repo: https://github.com/jenkins-x/jx3-pipeline-catalog
+    directory: /packs/go-plugin/.lighthouse/jenkins-x
+    ref: master
diff --git a/.lighthouse/jenkins-x/pullrequest.yaml b/.lighthouse/jenkins-x/pullrequest.yaml
@@ -19,7 +19,7 @@ spec:
               memory: 600Mi
           workingDir: /workspace/source
         steps:
-        - image: gcr.io/jenkinsxio/jx-boot:3.0.738
+        - image: gcr.io/jenkinsxio/jx-boot:3.0.773
           name: jx-variables
           resources: {}
           script: |

diff --git a/.lighthouse/jenkins-x/release.yaml b/.lighthouse/jenkins-x/release.yaml
@@ -16,25 +16,14 @@ spec:
           resources: {}
           workingDir: /workspace/source
         steps:
-        - image: gcr.io/jenkinsxio/builder-go
+        - image: gcr.io/jenkinsxio/jx-release-version:1.0.42
           name: next-version
           resources: {}
           script: |
             #!/usr/bin/env bash
-            jx step next-version --use-git-tag-only
-        - image: gcr.io/jenkinsxio/builder-go
-          name: update-version
-          resources: {}
-          script: |
-            #!/usr/bin/env bash
-            jx step tag --version $(cat VERSION) --no-apply
-        - image: gcr.io/jenkinsxio/builder-go
-          name: tag-version
-          resources: {}
-          script: |
-            #!/usr/bin/env bash
-            jx step tag --version $(cat VERSION)
-        - image: gcr.io/jenkinsxio/jx-boot:3.0.738
+            VERSION=$(jx-release-version)
+            echo $VERSION > VERSION
+        - image: gcr.io/jenkinsxio/jx-boot:3.0.773
           name: jx-variables
           resources: {}
           script: |
@@ -62,29 +51,45 @@ spec:
             #!/bin/ash
             if [ -d "/workspace/source/charts/$REPO_NAME" ]; then cd /workspace/source/charts/$REPO_NAME
             helm-docs; else echo no charts; fi
-        - image: rawlingsj80/helm-release:wip1
+        - image: gcr.io/jenkinsxio/jx-boot:3.0.773
           name: release-chart
           resources: {}
           script: |
             #!/usr/bin/env sh
             if [ -d "/workspace/source/charts/$REPO_NAME" ]; then source .jx/variables.sh
             cd /workspace/source/charts/$REPO_NAME
             make release; else echo no charts; fi
-        - image: gcr.io/jenkinsxio/builder-go:2.1.142-761
+        - image: gcr.io/jenkinsxio/jx-changelog:0.0.8
           name: changelog
-          resources: {}
           script: |
-            #!/bin/bash
+            #!/usr/bin/env sh
             source .jx/variables.sh
-            jx step changelog --verbose --header-file=hack/changelog-header.md --version=$VERSION --rev=$PULL_BASE_SHA --output-markdown=changelog.md --update-release=false
+
+            if [ -d "/workspace/source/charts/$REPO_NAME" ]; then
+            sed -i -e "s/^version:.*/version: $VERSION/" ./charts/$REPO_NAME/Chart.yaml
+            sed -i -e "s/repository:.*/repository: $DOCKER_REGISTRY\/$DOCKER_REGISTRY_ORG\/$APP_NAME/" ./charts/$REPO_NAME/values.yaml
+            sed -i -e "s/tag:.*/tag: $VERSION/" ./charts/$REPO_NAME/values.yaml;
+            else echo no charts; fi
+
+            git commit -a -m "release $VERSION" --allow-empty
+            git tag -fa v$VERSION -m "Release version $VERSION"
+            git push origin v$VERSION
+
+            jx changelog create --verbose --header-file=hack/changelog-header.md --version=$VERSION --rev=$PULL_BASE_SHA --output-markdown=changelog.md --update-release=false
         - image: gcr.io/jenkinsxio/step-go-releaser:0.0.14
           name: upload-binaries
           resources: {}
           script: |
             #!/bin/bash
             source .jx/variables.sh
             make goreleaser
-
+        - image: gcr.io/jenkinsxio/builder-go:2.1.142-761
+          name: promote-release
+          resources: {}
+          script: |
+            #!/bin/bash
+            source .jx/variables.sh
+            ./promote.sh
   podTemplate: {}
   serviceAccountName: tekton-bot
   timeout: 240h0m0s