PR#743: Make ostree installer before cloud images - pungi

pungi

#743 Make ostree installer before cloud images

Merged 6 years ago by ausil. Opened 6 years ago by lsedlar.

lsedlar/pungi phase-reorder into master

Make ostree installer before cloud images

Lubomír Sedlář • 6 years ago

19436c6

bin/pungi-koji

file modified

+2 -4

		`@@ -381,9 +381,8 @@`
		`ostree_phase.start()`
		`ostree_phase.stop()`

		`- # PRODUCTIMG phase`
		`- productimg_phase.start()`
		`- productimg_phase.stop()`
		`+ pungi.phases.run_all([productimg_phase,`
		`+ ostree_installer_phase])`

		`# write treeinfo before ISOs are created`
		`for variant in compose.get_variants():`
		`@@ -403,7 +402,6 @@`
		`liveimages_phase,`
		`image_build_phase,`
		`livemedia_phase,`
		`- ostree_installer_phase,`
		`osbs_phase])`

		`image_checksum_phase.start()`

doc/_static/phases.png

file modified

doc/_static/phases.svg

file modified

+70 -66

		`@@ -9,9 +9,9 @@`
		`xmlns="http://www.w3.org/2000/svg"`
		`xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"`
		`xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"`
		`- width="821.33331"`
		`- height="264.33334"`
		`- viewBox="0 0 821.33334 264.33335"`
		`+ width="839.33331"`
		`+ height="220.33334"`
		`+ viewBox="0 0 839.33334 220.33335"`
		`id="svg2"`
		`version="1.1"`
		`inkscape:version="0.92+devel unknown"`
		`@@ -26,15 +26,15 @@`
		`borderopacity="1.0"`
		`inkscape:pageopacity="1"`
		`inkscape:pageshadow="2"`
		`- inkscape:zoom="1.6532468"`
		`- inkscape:cx="487.41703"`
		`- inkscape:cy="90.21684"`
		`+ inkscape:zoom="0.8266234"`
		`+ inkscape:cx="226.63066"`
		`+ inkscape:cy="201.60264"`
		`inkscape:document-units="px"`
		`inkscape:current-layer="layer1"`
		`showgrid="false"`
		`inkscape:window-width="1920"`
		`inkscape:window-height="1016"`
		`- inkscape:window-x="1920"`
		`+ inkscape:window-x="0"`
		`inkscape:window-y="27"`
		`inkscape:window-maximized="1"`
		`units="px"`
		`@@ -72,12 +72,12 @@`
		`</rdf:RDF>`
		`</metadata>`
		`<g`
		`- transform="matrix(1.066667,0,0,1.066667,0,-858.18642)"`
		`+ transform="matrix(1.066667,0,0,1.066667,0,-902.18643)"`
		`id="layer1"`
		`inkscape:groupmode="layer"`
		`inkscape:label="Vrstva 1">`
		`<g`
		`- transform="translate(-1.131703,-122.61379)"`
		`+ transform="translate(-1.131703,-80.47309)"`
		`id="g3411">`
		`<rect`
		`style="fill:#8ae234;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"`
		`@@ -100,7 +100,7 @@`
		`style="font-size:13.14787769px;line-height:1.25">Pkgset</tspan></text>`
		`</g>`
		`<g`
		`- transform="translate(-4.582059,-122.61379)"`
		`+ transform="translate(-4.582059,-80.47309)"`
		`id="g3416">`
		`<rect`
		`style="fill:#fcaf3e;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"`
		`@@ -180,30 +180,7 @@`
		`style="font-size:13.14787769px;line-height:1.25">Createrepo</tspan></text>`
		`</g>`
		`<g`
		`- transform="translate(51.751666,-122.61373)"`
		`- id="g3430">`
		`- <rect`
		`- style="fill:#a40000;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"`
		`- id="rect3350"`
		`- width="26.295755"`
		`- height="83.352409"`
		`- x="953.49091"`
		`- y="349.10342"`
		`- transform="matrix(0,1,1,0,0,0)" />`
		`- <text`
		`- xml:space="preserve"`
		`- style="font-style:normal;font-weight:normal;line-height:0%;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"`
		`- x="351.40778"`
		`- y="970.26605"`
		`- id="text3380"><tspan`
		`- sodipodi:role="line"`
		`- id="tspan3382"`
		`- x="351.40778"`
		`- y="970.26605"`
		`- style="font-size:13.14787769px;line-height:1.25">Productimg</tspan></text>`
		`- </g>`
		`- <g`
		`- transform="translate(45.632403,-122.61379)"`
		`+ transform="translate(63.81395,-80.47309)"`
		`id="g3446">`
		`<rect`
		`y="554.10059"`
		`@@ -226,7 +203,7 @@`
		`style="font-size:13.14749908px;line-height:1.25">ImageChecksum</tspan></text>`
		`</g>`
		`<g`
		`- transform="translate(167.68135,-122.61379)"`
		`+ transform="translate(185.8629,-80.47309)"`
		`id="g3398">`
		`<rect`
		`y="553.98242"`
		`@@ -249,7 +226,7 @@`
		`style="font-size:13.14787769px;line-height:1.25">Test</tspan></text>`
		`</g>`
		`<g`
		`- transform="translate(2.318656,-122.61379)"`
		`+ transform="translate(2.318656,-80.47309)"`
		`id="g3406">`
		`<rect`
		`style="fill:#fce94f;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"`
		`@@ -274,10 +251,10 @@`
		`<path`
		`inkscape:connector-curvature="0"`
		`id="path3642"`
		`- d="M 100.90864,817.7484 H 712.42335"`
		`+ d="M 100.90864,859.8891 H 712.42335"`
		`style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:1.23489845px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;marker-end:url(#Arrow1Lend)" />`
		`<g`
		`- transform="translate(86.469501,7.3304162)"`
		`+ transform="translate(86.469501,49.471116)"`
		`id="g3408">`
		`<rect`
		`style="fill:#729fcf;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"`
		`@@ -300,9 +277,58 @@`
		`style="font-size:13.14787769px;line-height:1.25">OSTree</tspan></text>`
		`</g>`
		`<g`
		`- id="g336">`
		`+ id="g251"`
		`+ transform="translate(0,42.1407)">`
		`+ <g`
		`+ id="g241">`
		`+ <rect`
		`+ transform="matrix(0,1,1,0,0,0)"`
		`+ y="400.8551"`
		`+ x="830.8772"`
		`+ height="101.73411"`
		`+ width="26.295755"`
		`+ id="rect3350"`
		`+ style="fill:#a40000;fill-rule:evenodd;stroke:none;stroke-width:1.10477591px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />`
		`+ <text`
		`+ id="text3380"`
		`+ y="847.65234"`
		`+ x="403.15945"`
		`+ style="font-style:normal;font-weight:normal;line-height:0%;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"`
		`+ xml:space="preserve"><tspan`
		`+ style="font-size:13.14787769px;line-height:1.25"`
		`+ y="847.65234"`
		`+ x="403.15945"`
		`+ id="tspan3382"`
		`+ sodipodi:role="line">Productimg</tspan></text>`
		`+ </g>`
		`+ <g`
		`+ transform="translate(-89.482556,-154.87768)"`
		`+ id="g288">`
		`+ <rect`
		`+ transform="matrix(0,1,1,0,0,0)"`
		`+ y="490.33765"`
		`+ x="1022.637"`
		`+ height="101.85102"`
		`+ width="26.295755"`
		`+ id="rect3428"`
		`+ style="fill:#fcaf3e;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />`
		`+ <text`
		`+ id="text3430"`
		`+ y="1039.4121"`
		`+ x="492.642"`
		+ style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:11.99999714px;line-height:0%;font-family:sans-serif;-inkscape-font-specification:'sans-serif, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:start;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
		`+ xml:space="preserve"><tspan`
		`+ y="1039.4121"`
		`+ x="492.642"`
		`+ sodipodi:role="line"`
		`+ id="tspan283">OSTreeInstaller</tspan></text>`
		`+ </g>`
		`+ </g>`
		`+ <g`
		`+ id="g236"`
		`+ transform="translate(0,42.1407)">`
		`<g`
		`- transform="translate(70.651385,-122.61379)"`
		`+ transform="translate(88.832932,-122.61379)"`
		`id="g3458">`
		`<rect`
		`transform="matrix(0,1,1,0,0,0)"`
		`@@ -326,7 +352,7 @@`
		`</g>`
		`<g`
		`id="g3453"`
		`- transform="translate(70.394938,-121.89312)">`
		`+ transform="translate(88.576485,-121.89312)">`
		`<rect`
		`transform="matrix(0,1,1,0,0,0)"`
		`y="420.39337"`
		`@@ -349,7 +375,7 @@`
		`</g>`
		`<g`
		`id="g3448"`
		`- transform="translate(70.394938,-121.42489)">`
		`+ transform="translate(88.576485,-121.42489)">`
		`<rect`
		`transform="matrix(0,1,1,0,0,0)"`
		`y="420.39337"`
		`@@ -372,7 +398,7 @@`
		`</g>`
		`<g`
		`id="g3443"`
		`- transform="translate(69.687846,-121.31225)">`
		`+ transform="translate(87.869393,-121.31225)">`
		`<rect`
		`style="fill:#edd400;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"`
		`id="rect3422"`
		`@@ -394,29 +420,7 @@`
		`style="font-size:13.14787769px;line-height:1.25">LiveMedia</tspan></text>`
		`</g>`
		`<g`
		`- transform="translate(0.45066315,-44.231132)"`
		`- id="g288">`
		`- <rect`
		`- transform="matrix(0,1,1,0,0,0)"`
		`- y="490.33765"`
		`- x="1022.637"`
		`- height="101.85102"`
		`- width="26.295755"`
		`- id="rect3428"`
		`- style="fill:#fcaf3e;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />`
		`- <text`
		`- id="text3430"`
		`- y="1039.4121"`
		`- x="492.642"`
		- style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:11.99999714px;line-height:0%;font-family:sans-serif;-inkscape-font-specification:'sans-serif, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:start;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
		`- xml:space="preserve"><tspan`
		`- y="1039.4121"`
		`- x="492.642"`
		`- sodipodi:role="line"`
		`- id="tspan283">OSTreeInstaller</tspan></text>`
		`- </g>`
		`- <g`
		`- transform="translate(0.45066315,-35.507965)"`
		`+ transform="translate(18.63221,-71.202583)"`
		`id="g306">`
		`<rect`
		`style="fill:#c17d11;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"`