Skip to content

changes required to rebuild 7.1.1 in the CentOS environment #30

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

Merged
merged 1 commit into from
May 5, 2015
Merged

changes required to rebuild 7.1.1 in the CentOS environment #30

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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 build_ostree_components.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ GitDir=${HomeDir}/sig-atomic-buildscripts/

cd $HomeDir
test -d ${GitDir} || git clone https://github.com/CentOS/sig-atomic-buildscripts
cd ${GitDir}; git clean -dfx; git reset --hard origin/master; git pull -r
cd ${GitDir}; git clean -dfx; git reset --hard origin/downstream; git pull -r

# backup the last built repo
# XXX: We need to only retain the last 14 builds or so, Todo, add a find + rm for older tree's
Expand All @@ -27,7 +27,7 @@ fi

cd ${BuildDir}
echo '---------- installer ' >> ${LogFile}
rpm-ostree-toolbox installer -c ${GitDir}/installer.ini -o installer >> ${LogFile} 2>&1
rpm-ostree-toolbox installer -c ${GitDir}/config.ini -o installer >> ${LogFile} 2>&1
# we likely need to push the installer content to somewhere the following kickstart
# can pick the content from ( does it otherwise work with a file:/// url ? unlikely )
echo '---------- Vagrant ' >> ${LogFile}
Expand Down
19 changes: 15 additions & 4 deletions config.ini
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,15 +4,26 @@ outputdir =
# workdir =
# srcdir = os.path.join(os.path.dirname(sys.argv[0], '..')
ostree_repo = %(outputdir)s/repo
os_name = rhel-atomic-host
os_pretty_name = RHEL Atomic Host
docker_os_name = registry.access.redhat.com/rhel7
os_name = centos-atomic-host
os_pretty_name = CentOS Atomic Host
docker_os_name = mirror.centos.org/centos7-atomic-builder
tree_name = standard
tree_file = %(os_name)s.json
is_final = True
arch = x86_64
release = 7
ref = %(os_name)s/%(release)s/%(arch)s/%(tree_name)s
yum_baseurl = http://download.eng.bos.redhat.com/brewroot/repos/atomic-rhel-7.1-image-build/latest/%(arch)s

# This is unique to the 7.1.1 build - We must exclude the 7.1 anaconda
# to allow the Atomic-specific anaconda to be pulled in. This should go
# away in future Atomic downstream rebuilds.
lorax_exclude_packages = kexec-tools-anaconda-addon,anaconda-19.31.123-1.el7.centos.2,anaconda-core-19.31.123-1.el7.centos.2,anaconda-dracut-19.31.123-1.el7.centos.2,anaconda-gui-19.31.123-1.el7.centos.2,anaconda-tui-19.31.123-1.el7.centos.2,anaconda-widgets-19.31.123-1.el7.centos.2

# Base repository
yum_baseurl = http://mirror.centos.org/centos/%(release)s/os/%(arch)s/

# Repositories above and beyond yum_baseurl that lorax can use to compose ISO content.
# These need to be provides in a comma separated list.
lorax_additional_repos = http://mirror.centos.org/centos/%(release)s/updates/%(arch)s/, http://buildlogs.centos.org/cah-0.0.1/

[7]