Skip to content

Switch to faster moving cri-o rpms #288

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

Merged
merged 1 commit into from
Sep 14, 2018
Merged
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
8 changes: 8 additions & 0 deletions Jenkinsfile.treecompose
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,14 @@ node(NODE) {
}
}

stage("Pull in creds for cri-o-tested repo") {
withCredentials([
file(credentialsId: params.OPENSHIFT_MIRROR_CREDENTIALS_FILE, variable: 'OPENSHIFT_MIRROR_CREDENTIALS_FILE'),
]) {
sh """cp ${OPENSHIFT_MIRROR_CREDENTIALS_FILE} ${WORKSPACE}/ops-mirror.pem && sed -i -e "s~WORKSPACE~$WORKSPACE~g" ${WORKSPACE}/cri-o-tested.repo"""
}
}

def last_build_version, force_nocache
stage("Check for Changes") { sh """
make repo-refresh
Expand Down
10 changes: 10 additions & 0 deletions cri-o-tested.repo
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
[cri-o-tested]
name=RHEL tested cri-o repo with dependencies
baseurl=https://mirror.ops.rhcloud.com/enterprise/rhel/cri-o-tested/3.11/x86_64/os/
type=rpm-md
skip_if_unavailable=True
gpgcheck=0
enabled=1
sslverify=0
sslclientkey=WORKSPACE/ops-mirror.pem
sslclientcert=WORKSPACE/ops-mirror.pem
2 changes: 1 addition & 1 deletion host-base.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ packages:
# SSH
- openssh-server openssh-clients
# Containers
- podman skopeo runc
- podman skopeo runc containernetworking-plugins
- cri-o cri-tools
# Networking
- nfs-utils
Expand Down
1 change: 1 addition & 0 deletions host-maipo.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@ repos:
- maipo-glusterfs
- dustymabe-ignition
- lucab-rhcos-coreos-metadata
- cri-o-tested
mutate-os-release: "4.0"
packages:
# auth legacy
Expand Down
5 changes: 5 additions & 0 deletions pipeline-utils.groovy
Original file line number Diff line number Diff line change
Expand Up @@ -43,6 +43,11 @@ def define_properties(timer) {
description: "Credentials for Docker registry.",
defaultValue: 'e3fd566b-46c1-44e4-aec9-bb59214c1926',
required: true),
credentials(name: 'OPENSHIFT_MIRROR_CREDENTIALS_FILE',
credentialType: 'org.jenkinsci.plugins.plaincredentials.impl.FileCredentialsImpl',
description: "OpenShift shared-secrets mirror cred as file.",
defaultValue: '299ad25c-f8d1-4f56-9f00-06a85490321a',
required: true),
// Past here, we're just using parameters as a way to avoid hardcoding internal values; they
// are not actually secret.
booleanParam(name: 'DRY_RUN', defaultValue: developmentPipeline, description: 'If true, do not push changes'),
Expand Down
9 changes: 0 additions & 9 deletions rdgo/overlay.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,9 +19,6 @@ components:
override-version: "1.13.1"
branch: docker-1.13.1-rhel

- distgit: cri-o
- distgit: cri-tools

# pull ignition directly from copr for now
# - src: github:coreos/ignition
# distgit:
Expand All @@ -30,12 +27,6 @@ components:
# patches: drop
# branch: master

# Required as a cri-o dependency
- src: https://github.com/containernetworking/plugins.git
distgit:
name: containernetworking-cni
patches: drop

- src: github:openshift/redhat-release-coreos
spec: internal

Expand Down