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.

Sign up for GitHub

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

treecompose: use atomic-openshift-* packages #327

Merged
merged 2 commits into from
Oct 3, 2018
Merged

treecompose: use atomic-openshift-* packages #327

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
8cf1e4d
generate-openshift-repo: make atomic-openshift repo
miabbott Sep 27, 2018
a1ca417
host*: use signed atomic-openshift packages
miabbott Sep 27, 2018
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: 4 additions & 0 deletions generate-openshift-repo
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,14 @@
set -xeuo pipefail

LATEST_OPENSHIFT_REPO=`curl https://storage.googleapis.com/origin-ci-test/releases/openshift/origin/master/.latest-rpms`
LATEST_ATOMIC_OPENSHIFT_REPO='http://download-node-02.eng.bos.redhat.com/rcm-guest/puddles/RHAOS/AtomicOpenShift/4.0/latest/puddle.repo'

echo "[openshift]
name=openshift
baseurl=${LATEST_OPENSHIFT_REPO}
type=rpm
enabled=1
gpgcheck=0" > openshift.repo

curl -L -s "${LATEST_ATOMIC_OPENSHIFT_REPO}" | head -n 5 > atomic-openshift.repo
sed -i "1s|.*|[atomic-openshift]|" atomic-openshift.repo
2 changes: 1 addition & 1 deletion host-base.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -167,7 +167,7 @@ packages:
# Editors
- vim-minimal nano
# OpenShift
- origin-node origin-hyperkube origin-clients
- atomic-openshift-node atomic-openshift-hyperkube atomic-openshift-clients
# pivot/ota tools
- pivot
# Red Hat CA certs
Expand Down
6 changes: 2 additions & 4 deletions host-maipo.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,8 @@ repos:
- rhcos-continuous
# We currently track ostree/rpm-ostree git master upstream
- atomic-centos-continuous
# Generated via Origin PR jobs
- openshift
# Generated by ART team
- atomic-openshift
# Maintained by containers runtime team
- cri-o-tested
# COPRs
Expand All @@ -38,8 +38,6 @@ packages:
- container-storage-setup cloud-utils-growpart
# Remote storage (maipo only)
- ceph-common glusterfs-fuse
# OpenShift
- origin-node origin-hyperkube origin-clients

remove-from-packages:
# https://github.com/openshift/os/issues/275
Expand Down