Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

some updates for OpenShift Pipeline 1.5 #12

Open
wants to merge 2 commits into
base: pipelines-1.3
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions cd/gogs.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -166,7 +166,7 @@ spec:
type: ClusterIP
---
kind: Route
apiVersion: v1
apiVersion: route.openshift.io/v1
id: gogs-http
metadata:
labels:
Expand Down Expand Up @@ -200,4 +200,4 @@ spec:
- ReadWriteOnce
resources:
requests:
storage: 1Gi
storage: 1Gi
6 changes: 3 additions & 3 deletions cd/nexus.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ spec:
spec:
containers:
- name: nexus
image: quay.io/siamaksade/nexus3:3.16.2
image: quay.io/rbaumgar/nexus3:3.38.0
env:
- name: CONTEXT_PATH
value: /
Expand Down Expand Up @@ -81,7 +81,7 @@ spec:
sessionAffinity: None
type: ClusterIP
---
apiVersion: v1
apiVersion: route.openshift.io/v1
kind: Route
metadata:
labels:
Expand All @@ -106,4 +106,4 @@ spec:
- ReadWriteOnce
resources:
requests:
storage: 5Gi
storage: 5Gi
4 changes: 2 additions & 2 deletions cd/reports-repo.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -91,7 +91,7 @@ spec:
app: reports-repo
deployment: reports-repo
---
apiVersion: v1
apiVersion: route.openshift.io/v1
kind: Route
metadata:
labels:
Expand All @@ -116,4 +116,4 @@ spec:
- ReadWriteOnce
resources:
requests:
storage: 5Gi
storage: 5Gi
4 changes: 2 additions & 2 deletions cd/sonarqube.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -78,7 +78,7 @@ spec:
- name: sonarqube-logs
emptyDir: {}
---
apiVersion: v1
apiVersion: route.openshift.io/v1
kind: Route
metadata:
labels:
Expand Down Expand Up @@ -110,4 +110,4 @@ spec:
selector:
app: sonarqube
name: sonarqube
type: ClusterIP
type: ClusterIP
7 changes: 6 additions & 1 deletion demo.sh
Original file line number Diff line number Diff line change
Expand Up @@ -105,7 +105,11 @@ command.install() {
oc rollout status deployment/gogs -n $cicd_prj
oc create -f config/gogs-init-taskrun.yaml -n $cicd_prj

oc project $cicd_prj
oc project $cicd_prj

info "Wait for Nexus to be ready"
oc wait --for=condition=ready `oc get pod -o name|grep nexus-` --timeout=300s
NEXUS_PASSWORD=$(oc rsh deployment/nexus cat /nexus-data/admin.password)

cat <<-EOF

Expand All @@ -132,6 +136,7 @@ command.install() {
Reports Server: http://$(oc get route reports-repo -o template --template='{{.spec.host}}' -n $cicd_prj)
SonarQube: https://$(oc get route sonarqube -o template --template='{{.spec.host}}' -n $cicd_prj)
Sonatype Nexus: http://$(oc get route nexus -o template --template='{{.spec.host}}' -n $cicd_prj)
password: $NEXUS_PASSWORD

############################################################################
############################################################################
Expand Down
7 changes: 3 additions & 4 deletions pipelines/pipeline-deploy-dev.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ spec:
taskRef:
name: maven
runAfter:
- source-clone
- dependency-report
workspaces:
- name: source
workspace: workspace
Expand All @@ -67,7 +67,7 @@ spec:
taskRef:
name: maven
runAfter:
- source-clone
- dependency-report
workspaces:
- name: source
workspace: workspace
Expand Down Expand Up @@ -101,7 +101,6 @@ spec:
name: maven
runAfter:
- code-analysis
- dependency-report
- unit-tests
workspaces:
- name: source
Expand Down Expand Up @@ -214,4 +213,4 @@ spec:
workspaces:
- name: simulations
workspace: workspace
subPath: spring-petclinic-gatling
subPath: spring-petclinic-gatling
2 changes: 1 addition & 1 deletion triggers/eventlistener.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ spec:
bindings:
- ref: gogs-triggerbinding
template:
name: petclinic-trigger-template
ref: petclinic-trigger-template
---
apiVersion: route.openshift.io/v1
kind: Route
Expand Down