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

modify scripts to build cah-devel/continuous #80

Merged
merged 1 commit into from
May 20, 2016
Merged

modify scripts to build cah-devel/continuous #80

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
2 changes: 1 addition & 1 deletion atomic-7.1-cloud.ks
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ volgroup atomicos pv.01
logvol / --size=3000 --fstype="xfs" --name=root --vgname=atomicos

# Equivalent of %include fedora-repo.ks
ostreesetup --osname="centos-atomic-host" --remote="centos-atomic-host" --ref="centos-atomic-host/7/x86_64/standard" --url="http://192.168.122.1:8000/repo/" --nogpg
ostreesetup --osname="centos-atomic-host" --remote="centos-atomic-host" --ref="centos-atomic-host/7/x86_64/devel/continuous" --url="http://192.168.122.1:8000/repo/" --nogpg

reboot

Expand Down
2 changes: 1 addition & 1 deletion atomic-7.1-vagrant.ks
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ part pv.01 --grow
volgroup atomicos pv.01
logvol / --size=3000 --fstype="xfs" --name=root --vgname=atomicos

ostreesetup --osname="centos-atomic-host" --remote="centos-atomic-host" --ref="centos-atomic-host/7/x86_64/standard" --url="http://192.168.122.1:8000/repo/" --nogpg
ostreesetup --osname="centos-atomic-host" --remote="centos-atomic-host" --ref="centos-atomic-host/7/x86_64/devel/continuous" --url="http://192.168.122.1:8000/repo/" --nogpg

reboot

Expand Down
4 changes: 2 additions & 2 deletions build_stage1.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ VERSION=7.$( date +%Y%m%d )-devel

## make treefile configurable

TreeFile="${TreeFile:-centos-atomic-host.json}"
TreeFile="${TreeFile:-centos-atomic-host-continuous.json}"

DateStamp=$( date +%Y%m%d_%H%M%S )
BuildDir=$1
Expand Down Expand Up @@ -64,7 +64,7 @@ fi

# sync repo from ds location

ostree remote add --repo=/srv/repo centos-atomic-host --set=gpg-verify=false http://mirror.centos.org/centos/7/atomic/x86_64/repo && ostree pull --repo=/srv/repo --mirror centos-atomic-host centos-atomic-host/7/x86_64/standard
#ostree remote add --repo=/srv/repo centos-atomic-host --set=gpg-verify=false http://mirror.centos.org/centos/7/atomic/x86_64/repo && ostree pull --repo=/srv/repo --mirror centos-atomic-host centos-atomic-host/7/x86_64/standard

## compose a new tree, based on defs in centos-atomic-host.json

Expand Down
2 changes: 1 addition & 1 deletion config.ini
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ outputdir =
os_name = centos-atomic-host
os_pretty_name = CentOS Atomic Host
docker_os_name = mirror.centos.org/centos7-atomic-builder
tree_name = standard
tree_name = devel/continuous
tree_file = %(os_name)s.json
is_final = True
arch = x86_64
Expand Down