Skip to content

Commit

Permalink
Merge pull request #4835 from elfosardo/add-openstack-beta-repos
Browse files Browse the repository at this point in the history
Add openstack beta repos mirror
  • Loading branch information
openshift-merge-robot authored Sep 9, 2019
2 parents f104d36 + 8aed853 commit 6a65f1c
Show file tree
Hide file tree
Showing 3 changed files with 74 additions and 0 deletions.
4 changes: 4 additions & 0 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -187,6 +187,10 @@ prow-ocp-rpm-secrets:
--from-file=cluster/test-deploy/gcp/ops-mirror.pem \
--from-file=ci-operator/infra/openshift/release-controller/repos/ocp-4.3-openstack.repo \
-o yaml --dry-run | oc apply -n ocp -f -
oc create secret generic base-openstack-beta-4-3-repos \
--from-file=cluster/test-deploy/gcp/ops-mirror.pem \
--from-file=ci-operator/infra/openshift/release-controller/repos/ocp-4.3-openstack-beta.repo \
-o yaml --dry-run | oc apply -n ocp -f -
.PHONY: prow-ocp-rpms-secrets

prow-jobs: prow-cluster-jobs prow-artifacts
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
[openstack-beta-rhel8]
name = rhel-openstack
baseurl = https://use-mirror1.ops.rhcloud.com/enterprise/reposync/4.3/ocp-4.3-openstack-beta-rhel8/
https://use-mirror2.ops.rhcloud.com/enterprise/reposync/4.3/ocp-4.3-openstack-beta-rhel8/
sslverify = false
sslclientkey = ops-mirror.pem
sslclientcert = ops-mirror.pem
failovermethod = priority
gpgcheck = 0
gpgkey = https://mirror.ops.rhcloud.com/libra/keys/RPM-GPG-KEY-redhat-release https://mirror.ops.rhcloud.com/libra/keys/RPM-GPG-KEY-redhat-beta https://mirror.ops.rhcloud.com/libra/keys/RPM-GPG-KEY-redhat-openshifthosted
60 changes: 60 additions & 0 deletions ci-operator/infra/openshift/release-controller/rpms-ocp-4.3.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -121,3 +121,63 @@ items:
- --max-size=5g
- --timeout=30m
- /tmp/repos

- apiVersion: v1
kind: Service
metadata:
name: openstack-beta-4-3
namespace: ocp
spec:
selector:
app: openstack-beta-4-3
ports:
- port: 80
targetPort: 8080
type: ClusterIP
- apiVersion: apps/v1
kind: Deployment
metadata:
name: openstack-beta-4-3
namespace: ocp
labels:
app: openstack-beta-4-3
annotations:
image.openshift.io/triggers: '[{"from":{"kind":"ImageStreamTag","name":"content-mirror:latest","namespace":"ci"},"fieldPath":"spec.template.spec.containers[?(@.name==\"mirror\")].image"}]'
spec:
replicas: 2
selector:
matchLabels:
app: openstack-beta-4-3
template:
metadata:
labels:
app: openstack-beta-4-3
spec:
volumes:
- name: repos
secret:
secretName: base-openstack-beta-4-3-repos
- name: cache
emptyDir: {}
- name: run
emptyDir: {}
containers:
- name: mirror
ports:
- name: http
containerPort: 8080
volumeMounts:
- name: repos
mountPath: /tmp/repos
readOnly: true
- name: cache
mountPath: /tmp/cache
image: " "
workingDir: /tmp/repos
command:
- content-mirror
- --path=/tmp/config
- --max-size=5g
- --timeout=30m
- /tmp/repos

0 comments on commit 6a65f1c

Please sign in to comment.