Update tripleo-image-elements $LKG, can now remove 4 merged cherry-picks
This commit is contained in:
parent
5ecb331ae4
commit
30ee598927
|
@ -59,7 +59,7 @@ export PIP_DOWNLOAD_CACHE=~/.cache/pip
|
|||
|
||||
if [ "$LKG" = "1" ]; then
|
||||
# These are set manually, since they're not part of source-repositories
|
||||
export DIB_REPOREF_tripleo_image_elements=07e7f1f9639863473e865ddccdcf4d882f227ee0
|
||||
export DIB_REPOREF_tripleo_image_elements=a64a3264de8136da4d30e2416f382b651754f035
|
||||
export DIB_REPOREF_diskimage_builder=de60893ccd78b35731828081e0aaa053676cbfed
|
||||
export DIB_REPOREF_os_cloud_config=a2b5ec4d4d0f22dd58454023324d1245ecdeece7
|
||||
export DIB_REPOREF_tripleo_incubator=c3fb309727671130a32b4c19de48ec22c8530aa1
|
||||
|
|
|
@ -59,11 +59,6 @@ function do_tripleo_source_installs {
|
|||
|
||||
popd
|
||||
|
||||
cherry_pick tripleo-image-elements refs/changes/54/125354/4
|
||||
cherry_pick tripleo-image-elements refs/changes/08/126508/2
|
||||
cherry_pick tripleo-image-elements refs/changes/95/127095/1
|
||||
cherry_pick tripleo-image-elements refs/changes/04/127104/1
|
||||
|
||||
# disable keepalived custom policy on RHEL because it doesn't install
|
||||
# https://bugzilla.redhat.com/show_bug.cgi?id=1151647
|
||||
export NODE_DIST=${NODE_DIST:-fedora}
|
||||
|
|
Loading…
Reference in New Issue