Skip to content

Commit 2be45b0

Browse files
jasonbrookscgwalters
authored andcommitted
modify scripts to build cah-devel/continuous (#80)
For now, the master branch will pull available atomic pkgs generated in the centos ci by rpmdistro-gitoverlay. To reflect this difference, the tree has the ref "devel/continuous". These changes adapt the image-building scripts accordingly.
1 parent c81b358 commit 2be45b0

File tree

4 files changed

+5
-5
lines changed

4 files changed

+5
-5
lines changed

atomic-7.1-cloud.ks

+1-1
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ volgroup atomicos pv.01
2626
logvol / --size=3000 --fstype="xfs" --name=root --vgname=atomicos
2727

2828
# Equivalent of %include fedora-repo.ks
29-
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
29+
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
3030

3131
reboot
3232

atomic-7.1-vagrant.ks

+1-1
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ part pv.01 --grow
2525
volgroup atomicos pv.01
2626
logvol / --size=3000 --fstype="xfs" --name=root --vgname=atomicos
2727

28-
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
28+
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
2929

3030
reboot
3131

build_stage1.sh

+2-2
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ VERSION=7.$( date +%Y%m%d )-devel
1818

1919
## make treefile configurable
2020

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

2323
DateStamp=$( date +%Y%m%d_%H%M%S )
2424
BuildDir=$1
@@ -64,7 +64,7 @@ fi
6464

6565
# sync repo from ds location
6666

67-
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
67+
#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
6868

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

config.ini

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ outputdir =
66
os_name = centos-atomic-host
77
os_pretty_name = CentOS Atomic Host
88
docker_os_name = mirror.centos.org/centos7-atomic-builder
9-
tree_name = standard
9+
tree_name = devel/continuous
1010
tree_file = %(os_name)s.json
1111
is_final = True
1212
arch = x86_64

0 commit comments

Comments
 (0)