Skip to content

Commit c3dcca4

Browse files
openshift-merge-robotopenshift-merge-robot
authored
Merge pull request #654 from ecordell/no-gitlab
chore(ci): remove ci checks for PRs
2 parents 5a4031b + b3ce2f7 commit c3dcca4

File tree

3 files changed

+6
-150
lines changed

3 files changed

+6
-150
lines changed

‎.gitlab-ci.jsonnet

Lines changed: 2 additions & 53 deletions
Original file line numberDiff line numberDiff line change
@@ -23,16 +23,6 @@ local stages = utils.set(stages_list);
2323

2424
// List CI jobs
2525
local jobs = {
26-
// Helpers
27-
local onlyMaster = {
28-
only: ['master', 'tags'],
29-
},
30-
31-
local onlyBranch = {
32-
only: ['branches'],
33-
except: ['master', 'tags'],
34-
},
35-
3626
'container-base-build': baseJob.dockerBuild {
3727
stage: stages.docker_base,
3828
script: docker.build_and_push(images.base.name,
@@ -56,7 +46,8 @@ local jobs = {
5646
'builder': images.ci.olm.name,
5747
'olm': images.prerelease.olm.name,
5848
'e2e': images.e2e.name,
59-
})
49+
}),
50+
only: ['master', 'tags'],
6051
},
6152

6253
'container-release': baseJob.dockerBuild {
@@ -81,23 +72,6 @@ local jobs = {
8172
only: ['tags'],
8273
},
8374

84-
"deploy-preview": baseJob.Deploy {
85-
local _vars = self.localvars,
86-
localvars+:: {
87-
helm_opts: ["--force"],
88-
},
89-
stage: stages.deploy_preview,
90-
when: "manual",
91-
environment+: {
92-
on_stop: "stop-preview",
93-
},
94-
} + onlyBranch,
95-
96-
"stop-preview": baseJob.DeployStop {
97-
when: "manual",
98-
stage: stages.deploy_preview,
99-
} + onlyBranch,
100-
10175
"deploy-staging": baseJob.Deploy {
10276
local _vars = self.localvars,
10377
localvars+:: {
@@ -116,31 +90,6 @@ local jobs = {
11690
only: ['master'],
11791
},
11892

119-
# currently not needed, to re-enable remove the "." prefix
120-
".deploy-teamui": baseJob.Deploy {
121-
local _vars = self.localvars,
122-
localvars+:: {
123-
image: images.release,
124-
domain: "teamui.console.team.coreos.systems",
125-
namespace: "operator-lifecycle-manager",
126-
catalog_namespace: "operator-lifecycle-manager",
127-
channel: "staging",
128-
helm_opts: ["--force"],
129-
kubeconfig: "$TEAMUI_KUBECONFIG",
130-
params+:: {
131-
watchedNamespaces: "",
132-
},
133-
},
134-
stage: stages.deploy_staging,
135-
script+: [
136-
"curl -X POST --data-urlencode \"payload={\\\"text\\\": \\\"New OLM Operator quay.io/coreos/olm:${CI_COMMIT_REF_SLUG}-${CI_COMMIT_SHA} deployed to ${TEAMUI_HOST}/k8s/ns/operator-lifecycle-manager/deployments/alm-operator\\\"}\" ${TEAMUI_SLACK_URL}",
137-
],
138-
environment+: {
139-
name: "teamui",
140-
},
141-
only: [''],
142-
},
143-
14493
"deploy-openshift": baseJob.Deploy {
14594
local _vars = self.localvars,
14695
localvars+:: {

‎.gitlab-ci.yml

Lines changed: 3 additions & 95 deletions
Original file line numberDiff line numberDiff line change
@@ -1,38 +1,6 @@
11
# Generated from .gitlab-ci.jsonnet
22
# DO NOT EDIT THIS FILE BY HAND -- YOUR CHANGES WILL BE OVERWRITTEN
33
---
4-
.deploy-teamui:
5-
before_script:
6-
- 'echo "version: 1.0.0-${CI_COMMIT_REF_SLUG}-pre" >> deploy/chart/Chart.yaml'
7-
- 'echo "{\"catalog.image.ref\": \"quay.io/coreos/olm:${CI_COMMIT_REF_SLUG}-${SHA8}\", \"catalog_namespace\": \"operator-lifecycle-manager\", \"namespace\": \"operator-lifecycle-manager\", \"olm.image.ref\":
8-
\"quay.io/coreos/olm:${CI_COMMIT_REF_SLUG}-${SHA8}\", \"package.image.ref\": \"quay.io/coreos/olm:${CI_COMMIT_REF_SLUG}-${SHA8}\", \"watchedNamespaces\": \"\"}" > params.json'
9-
- cat params.json
10-
environment:
11-
name: teamui
12-
url: https://teamui.console.team.coreos.systems
13-
image: quay.io/coreos/alm-ci-build:latest
14-
only:
15-
- ''
16-
script:
17-
- echo $TEAMUI_KUBECONFIG | base64 -d > kubeconfig
18-
- export KUBECONFIG=./kubeconfig
19-
- charttmpdir=`mktemp -d 2>/dev/null || mktemp -d -t 'charttmpdir'`;mkdir -p ${charttmpdir};helm template -n olm --set namespace=operator-lifecycle-manager deploy/chart --set catalog.image.ref=quay.io/coreos/olm:${CI_COMMIT_REF_SLUG}-${SHA8}
20-
--set catalog_namespace=operator-lifecycle-manager --set namespace=operator-lifecycle-manager --set olm.image.ref=quay.io/coreos/olm:${CI_COMMIT_REF_SLUG}-${SHA8} --set package.image.ref=quay.io/coreos/olm:${CI_COMMIT_REF_SLUG}-${SHA8}
21-
--set watchedNamespaces= --output-dir ${charttmpdir};chartfilenames=$(ls ${charttmpdir}/olm/templates/*.yaml);echo ${chartfilenames};for f in ${chartfilenames};do if [[ $f == *.configmap.yaml ]];then
22-
kubectl replace --force -f ${f};else kubectl apply -f ${f};fi;done;
23-
- kubectl create secret docker-registry coreos-pull-secret --docker-server quay.io --docker-username $DOCKER_USER --docker-password $DOCKER_PASS --docker-email [email protected] --namespace=operator-lifecycle-manager
24-
|| true
25-
- kubectl rollout status -w deployment/olm-operator --namespace=operator-lifecycle-manager
26-
- kubectl rollout status -w deployment/catalog-operator --namespace=operator-lifecycle-manager
27-
- kubectl rollout status -w deployment/package-server --namespace=operator-lifecycle-manager
28-
- 'curl -X POST --data-urlencode "payload={\"text\": \"New OLM Operator quay.io/coreos/olm:${CI_COMMIT_REF_SLUG}-${CI_COMMIT_SHA} deployed to ${TEAMUI_HOST}/k8s/ns/operator-lifecycle-manager/deployments/alm-operator\"}"
29-
${TEAMUI_SLACK_URL}'
30-
stage: deploy_staging
31-
tags:
32-
- kubernetes
33-
variables:
34-
ALM_DOMAIN: teamui.console.team.coreos.systems
35-
K8S_NAMESPACE: operator-lifecycle-manager
364
container-base-build:
375
before_script:
386
- docker login -u $DOCKER_USER -p $DOCKER_PASS quay.io
@@ -54,6 +22,9 @@ container-build:
5422
- docker login -u $DOCKER_USER -p $DOCKER_PASS quay.io
5523
- mkdir -p $PWD/bin
5624
image: docker:git
25+
only:
26+
- master
27+
- tags
5728
script:
5829
- docker build -f upstream.Dockerfile .
5930
- "docker tag $(docker images --filter 'label=stage=builder' --format '{{.CreatedAt}}\t{{.ID}}' | sort -nr | head -n 1 | cut -f2) quay.io/coreos/olm-ci:${CI_COMMIT_REF_SLUG}"
@@ -111,7 +82,6 @@ deploy-openshift:
11182
|| true
11283
- kubectl rollout status -w deployment/olm-operator --namespace=operator-lifecycle-manager
11384
- kubectl rollout status -w deployment/catalog-operator --namespace=operator-lifecycle-manager
114-
- kubectl rollout status -w deployment/package-server --namespace=operator-lifecycle-manager
11585
- 'curl -X POST --data-urlencode "payload={\"text\": \"New OLM Operator quay.io/coreos/olm:${CI_COMMIT_REF_SLUG}-${CI_COMMIT_SHA} deployed to ${OPENSHIFT_HOST}/k8s/ns/operator-lifecycle-manager/deployments/alm-operator\"}"
11686
${TEAMUI_SLACK_URL}'
11787
stage: deploy_staging
@@ -120,41 +90,6 @@ deploy-openshift:
12090
variables:
12191
ALM_DOMAIN: console.apps.ui-preserve.origin-gce.dev.openshift.com
12292
K8S_NAMESPACE: operator-lifecycle-manager
123-
deploy-preview:
124-
before_script:
125-
- 'echo "version: 1.0.0-${CI_COMMIT_REF_SLUG}-pre" >> deploy/chart/Chart.yaml'
126-
- 'echo "{\"catalog.image.ref\": \"quay.io/coreos/olm-ci:${CI_COMMIT_REF_SLUG}-pre\", \"catalog_namespace\": \"ci-olm-${CI_COMMIT_REF_SLUG}\", \"namespace\": \"ci-olm-${CI_COMMIT_REF_SLUG}\", \"olm.image.ref\":
127-
\"quay.io/coreos/olm-ci:${CI_COMMIT_REF_SLUG}-pre\", \"package.image.ref\": \"quay.io/coreos/olm-ci:${CI_COMMIT_REF_SLUG}-pre\", \"watchedNamespaces\": \"ci-olm-${CI_COMMIT_REF_SLUG}\"}" > params.json'
128-
- cat params.json
129-
environment:
130-
name: review/ci-olm-${CI_COMMIT_REF_SLUG}
131-
on_stop: stop-preview
132-
url: https://olm-${CI_COMMIT_REF_SLUG}.k8s.devtable.com
133-
except:
134-
- master
135-
- tags
136-
image: quay.io/coreos/alm-ci-build:latest
137-
only:
138-
- branches
139-
script:
140-
- echo $CD_KUBECONFIG | base64 -d > kubeconfig
141-
- export KUBECONFIG=./kubeconfig
142-
- charttmpdir=`mktemp -d 2>/dev/null || mktemp -d -t 'charttmpdir'`;mkdir -p ${charttmpdir};helm template -n olm --set namespace=ci-olm-${CI_COMMIT_REF_SLUG} deploy/chart --set catalog.image.ref=quay.io/coreos/olm-ci:${CI_COMMIT_REF_SLUG}-pre
143-
--set catalog_namespace=ci-olm-${CI_COMMIT_REF_SLUG} --set namespace=ci-olm-${CI_COMMIT_REF_SLUG} --set olm.image.ref=quay.io/coreos/olm-ci:${CI_COMMIT_REF_SLUG}-pre --set package.image.ref=quay.io/coreos/olm-ci:${CI_COMMIT_REF_SLUG}-pre
144-
--set watchedNamespaces=ci-olm-${CI_COMMIT_REF_SLUG} --output-dir ${charttmpdir};chartfilenames=$(ls ${charttmpdir}/olm/templates/*.yaml);echo ${chartfilenames};for f in ${chartfilenames};do if [[ $f
145-
== *.configmap.yaml ]];then kubectl replace --force -f ${f};else kubectl apply -f ${f};fi;done;
146-
- kubectl create secret docker-registry coreos-pull-secret --docker-server quay.io --docker-username $DOCKER_USER --docker-password $DOCKER_PASS --docker-email [email protected] --namespace=ci-olm-${CI_COMMIT_REF_SLUG}
147-
|| true
148-
- kubectl rollout status -w deployment/olm-operator --namespace=ci-olm-${CI_COMMIT_REF_SLUG}
149-
- kubectl rollout status -w deployment/catalog-operator --namespace=ci-olm-${CI_COMMIT_REF_SLUG}
150-
- kubectl rollout status -w deployment/package-server --namespace=ci-olm-${CI_COMMIT_REF_SLUG}
151-
stage: deploy_preview
152-
tags:
153-
- kubernetes
154-
variables:
155-
ALM_DOMAIN: olm-${CI_COMMIT_REF_SLUG}.k8s.devtable.com
156-
K8S_NAMESPACE: ci-olm-${CI_COMMIT_REF_SLUG}
157-
when: manual
15893
deploy-staging:
15994
before_script:
16095
- 'echo "version: 1.0.0-${CI_COMMIT_REF_SLUG}-pre" >> deploy/chart/Chart.yaml'
@@ -178,7 +113,6 @@ deploy-staging:
178113
|| true
179114
- kubectl rollout status -w deployment/olm-operator --namespace=ci-alm-staging
180115
- kubectl rollout status -w deployment/catalog-operator --namespace=ci-alm-staging
181-
- kubectl rollout status -w deployment/package-server --namespace=ci-alm-staging
182116
stage: deploy_staging
183117
tags:
184118
- kubernetes
@@ -196,32 +130,6 @@ stages:
196130
- docker_release
197131
- deploy_staging
198132
- teardown
199-
stop-preview:
200-
before_script: []
201-
environment:
202-
action: stop
203-
name: review/ci-olm-${CI_COMMIT_REF_SLUG}
204-
url: https://olm-${CI_COMMIT_REF_SLUG}.k8s.devtable.com
205-
except:
206-
- master
207-
- tags
208-
image: quay.io/coreos/alm-ci-build:latest
209-
only:
210-
- branches
211-
script:
212-
- echo $CD_KUBECONFIG | base64 -d > kubeconfig
213-
- export KUBECONFIG=./kubeconfig
214-
- kubectl delete apiservice v1alpha1.packages.apps.redhat.com --ignore-not-found=true
215-
- kubectl delete ns --ignore-not-found=true ci-olm-${CI_COMMIT_REF_SLUG}
216-
- kubectl get pods -o wide -n ci-olm-${CI_COMMIT_REF_SLUG}
217-
stage: deploy_preview
218-
tags:
219-
- kubernetes
220-
variables:
221-
ALM_DOMAIN: olm-${CI_COMMIT_REF_SLUG}.k8s.devtable.com
222-
GIT_STRATEGY: none
223-
K8S_NAMESPACE: ci-olm-${CI_COMMIT_REF_SLUG}
224-
when: manual
225133
tag-release:
226134
before_script:
227135
- docker login -u $DOCKER_USER -p $DOCKER_PASS quay.io

‎.gitlab-ci/base_jobs.libsonnet

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -71,8 +71,7 @@ local appr = utils.appr;
7171
"$DOCKER_USER",
7272
"$DOCKER_PASS") +
7373
k8s.waitForDeployment("olm-operator", _vars.namespace) +
74-
k8s.waitForDeployment("catalog-operator", _vars.namespace) +
75-
k8s.waitForDeployment("package-server", _vars.namespace),
74+
k8s.waitForDeployment("catalog-operator", _vars.namespace)
7675
} + job_tags,
7776

7877
DeployStop: self.Deploy {

0 commit comments

Comments
 (0)