Skip to content

Commit

Permalink
Merge pull request #12 from jenkins-x-plugins/pr-ed29baea-b1e5-4962-b…
Browse files Browse the repository at this point in the history
…206-c69659593a1c

chore: upgrade pipelines
  • Loading branch information
jstrachan authored Jan 27, 2021
2 parents 28f3fac + 7598eea commit 2533e4d
Show file tree
Hide file tree
Showing 3 changed files with 24 additions and 95 deletions.
11 changes: 0 additions & 11 deletions .lighthouse/jenkins-x/Kptfile

This file was deleted.

33 changes: 9 additions & 24 deletions .lighthouse/jenkins-x/pullrequest.yaml
Original file line number Diff line number Diff line change
@@ -1,8 +1,7 @@
apiVersion: tekton.dev/v1beta1
kind: PipelineRun
metadata:
annotations:
lighthouse.jenkins-x.io/prependStepsURL: https://raw.githubusercontent.com/jenkins-x/jx3-pipeline-catalog/005e78cf69b643862344397a635736a51dd1bd89/tasks/git-clone/git-clone-pr.yaml
creationTimestamp: null
name: pullrequest
spec:
pipelineSpec:
Expand All @@ -12,39 +11,25 @@ spec:
taskSpec:
metadata: {}
stepTemplate:
image: uses:jenkins-x/jx3-pipeline-catalog/tasks/go-plugin/pullrequest.yaml@versionStream
name: ""
resources:
requests:
cpu: 400m
memory: 600Mi
workingDir: /workspace/source
steps:
- image: gcr.io/jenkinsxio/jx-boot:3.0.773
name: jx-variables
- image: uses:jenkins-x/jx3-pipeline-catalog/tasks/git-clone/git-clone-pr.yaml@versionStream
name: ""
resources: {}
- name: jx-variables
resources: {}
script: |
#!/usr/bin/env sh
jx gitops variables
- image: golang:1.15
name: build-make-linux
- name: build-make-linux
resources: {}
script: |
#!/bin/sh
make linux
- image: golang:1.15
name: build-make-test
- name: build-make-test
resources: {}
script: |
#!/bin/sh
make test
- image: gcr.io/kaniko-project/executor:debug-v1.3.0
name: build-container-build
- name: build-container-build
resources: {}
script: |
#!/busybox/sh
source .jx/variables.sh
cp /tekton/creds-secrets/tekton-container-registry-auth/.dockerconfigjson /kaniko/.docker/config.json
/kaniko/executor $KANIKO_FLAGS --context=/workspace/source --dockerfile=/workspace/source/${DOCKERFILE_PATH:-Dockerfile} --destination=$DOCKER_REGISTRY/$DOCKER_REGISTRY_ORG/$REPO_NAME:$VERSION
podTemplate: {}
serviceAccountName: tekton-bot
timeout: 240h0m0s
Expand Down
75 changes: 15 additions & 60 deletions .lighthouse/jenkins-x/release.yaml
Original file line number Diff line number Diff line change
@@ -1,8 +1,7 @@
apiVersion: tekton.dev/v1beta1
kind: PipelineRun
metadata:
annotations:
lighthouse.jenkins-x.io/prependStepsURL: https://raw.githubusercontent.com/jenkins-x/jx3-pipeline-catalog/005e78cf69b643862344397a635736a51dd1bd89/tasks/git-clone/git-clone.yaml
creationTimestamp: null
name: release
spec:
pipelineSpec:
Expand All @@ -12,45 +11,24 @@ spec:
taskSpec:
metadata: {}
stepTemplate:
image: uses:jenkins-x/jx3-pipeline-catalog/tasks/go-plugin/release.yaml@versionStream
name: ""
resources: {}
workingDir: /workspace/source
steps:
- image: gcr.io/jenkinsxio/jx-release-version:1.0.42
name: next-version
- image: uses:jenkins-x/jx3-pipeline-catalog/tasks/git-clone/git-clone.yaml@versionStream
name: ""
resources: {}
script: |
#!/usr/bin/env bash
VERSION=$(jx-release-version)
echo $VERSION > VERSION
- image: gcr.io/jenkinsxio/jx-boot:3.0.773
name: jx-variables
- name: next-version
resources: {}
script: |
#!/usr/bin/env sh
jx gitops variables
- image: golang:1.15
name: release-binary
- name: jx-variables
resources: {}
script: |
#!/usr/bin/env sh
source .jx/variables.sh
make release
- image: gcr.io/kaniko-project/executor:debug-v1.3.0
name: build-and-push-image
- name: release-binary
resources: {}
script: |
#!/busybox/sh
source .jx/variables.sh
cp /tekton/creds-secrets/tekton-container-registry-auth/.dockerconfigjson /kaniko/.docker/config.json
/kaniko/executor $KANIKO_FLAGS --context=/workspace/source --dockerfile=/workspace/source/Dockerfile --destination=gcr.io/$DOCKER_REGISTRY_ORG/$REPO_NAME:$VERSION --destination=gcr.io/$DOCKER_REGISTRY_ORG/$REPO_NAME:latest
- image: jnorwood/helm-docs:v1.4.0
name: chart-docs
- name: build-and-push-image
resources: {}
- name: chart-docs
resources: {}
script: |
#!/bin/ash
if [ -d "/workspace/source/charts/$REPO_NAME" ]; then cd /workspace/source/charts/$REPO_NAME
helm-docs; else echo no charts; fi
- image: gcr.io/jenkinsxio/jx-boot:3.0.773
name: release-chart
resources: {}
Expand All @@ -59,35 +37,12 @@ spec:
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/jx-changelog:0.0.8
name: changelog
script: |
#!/usr/bin/env sh
source .jx/variables.sh
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
- name: changelog
resources: {}
- name: upload-binaries
resources: {}
- name: promote-release
resources: {}
script: |
#!/bin/bash
source .jx/variables.sh
make goreleaser
- command:
- jx-updatebot
- pr
image: gcr.io/jenkinsxio/jx-updatebot:latest
name: promote-release
podTemplate: {}
serviceAccountName: tekton-bot
timeout: 240h0m0s
Expand Down

0 comments on commit 2533e4d

Please sign in to comment.