@@ -167,7 +167,7 @@ local promote_arle_autopush_stable = {
167167 universes:: ['cloud-apt' , 'cloud-yum' , 'cloud-yuck' ],
168168 env:: 'stable' ,
169169 topic:: 'projects/artifact-releaser-autopush/topics/gcp-guest-package-upload-autopush' ,
170- artopic:: 'projects/artifact-releaser-autopush/subscriptions /artifact-registry-package-upload-autopush' ,
170+ artopic:: 'projects/artifact-releaser-autopush/topics /artifact-registry-package-upload-autopush' ,
171171 ostypes:: ['EL8_YUM' , 'BULLSEYE_APT' ],
172172
173173 name: 'promote-arle-autopush-stable' ,
@@ -208,7 +208,7 @@ local promote_arle_autopush_stable = {
208208 },
209209 }
210210 for i in std.range (0 , std.length (tl.repos) - 1 )
211- ] +
211+ ] +
212212 [
213213 {
214214 task: 'promote-registry-autopush-stable' ,
@@ -220,15 +220,15 @@ local promote_arle_autopush_stable = {
220220 },
221221 run: {
222222 path: 'gcloud' ,
223- args: [
224- 'pubsub' ,
225- 'topics' ,
226- 'publish' ,
227- tl.artopic,
228- '--message' ,
229- '{"type": "uploadToArtifactReleaser", "request": {"ostype": "%s", "pkgname": "some-pkg", "pkgversion": "some-version", "reponame": "some-repo"}}' %
230- [tl.ostypes[i]],
231- ],
223+ args: [
224+ 'pubsub' ,
225+ 'topics' ,
226+ 'publish' ,
227+ tl.artopic,
228+ '--message' ,
229+ '{"type": "uploadToArtifactReleaser", "request": {"ostype": "%s", "pkgname": "some-pkg", "pkgversion": "some-version", "reponame": "some-repo"}}' %
230+ [tl.ostypes[i]],
231+ ],
232232 },
233233 },
234234 }
@@ -419,60 +419,43 @@ local pkggroup = {
419419 'sql-2022-web-windows-2019-dc' ,
420420 'sql-2022-web-windows-2022-dc' ,
421421 ],
422- local mirantis_images = [
423- 'windows-server-2019-dc-for-containers' ,
424- 'windows-server-2019-dc-core-for-containers' ,
425- ],
426- local docker_ce_images = [
427- 'windows-server-2019-dc-for-containers-ce' ,
428- 'windows-server-2019-dc-core-for-containers-ce' ,
429- ],
430422 local windows_install_media_images = [
431423 'windows-install-media' ,
432424 ],
433- local prerelease_images = [
434- 'sql-2022-preview-windows-2022-dc' ,
435- ],
436425 local windows_client_images = windows_10_images + windows_11_images,
437426 local windows_server_images = windows_2012_images + windows_2016_images + windows_2019_images
438427 + windows_2022_images,
439428 local sql_images = sql_2014_images + sql_2016_images + sql_2017_images + sql_2019_images + sql_2022_images,
440429
441430 // Package builds and file endings.
442- local guest_agent_builds = ['deb10' , 'deb11-arm64' , 'el7' , ' el8' , 'el8-arch64' , 'el9' , 'el9-arch64' ],
431+ local guest_agent_builds = ['deb10' , 'deb11-arm64' , 'el8' , 'el8-arch64' , 'el9' , 'el9-arch64' ],
443432 local guest_agent_file_endings = [
444433 '-g1_amd64.deb' ,
445434 '-g1_arm64.deb' ,
446- '-g1.el7.x86_64.rpm' ,
447435 '-g1.el8.x86_64.rpm' ,
448436 '-g1.el8.aarch64.rpm' ,
449437 '-g1.el9.x86_64.rpm' ,
450438 '-g1.el9.aarch64.rpm' ,
451439 ],
452- local oslogin_builds = ['deb10' , ' deb11' , 'deb11-arm64' , ' deb12' , 'deb12-arm64' , 'el7 ' , 'el8' , 'el8-arch64' , 'el9' , 'el9-arch64' ],
440+ local oslogin_builds = ['deb11' , 'deb12' , 'deb12-arm64' , 'el8' , 'el8-arch64' , 'el9' , 'el9-arch64' ],
453441 local oslogin_file_endings = [
454- '-g1+deb10_amd64.deb' ,
455442 '-g1+deb11_amd64.deb' ,
456- '-g1+deb11_arm64.deb' ,
457443 '-g1+deb12_amd64.deb' ,
458444 '-g1+deb12_arm64.deb' ,
459- '-g1.el7.x86_64.rpm' ,
460445 '-g1.el8.x86_64.rpm' ,
461446 '-g1.el8.aarch64.rpm' ,
462447 '-g1.el9.x86_64.rpm' ,
463448 '-g1.el9.aarch64.rpm' ,
464449 ],
465- local guest_diskexpand_builds = ['deb10' , 'el7' , ' el8' , 'el9' ],
450+ local guest_diskexpand_builds = ['deb10' , 'el8' , 'el9' ],
466451 local guest_diskexpand_file_endings = [
467452 '-g1_all.deb' ,
468- '-g1.el7.noarch.rpm' ,
469453 '-g1.el8.noarch.rpm' ,
470454 '-g1.el9.noarch.rpm' ,
471455 ],
472- local guest_config_builds = ['deb10' , 'el7' , ' el8' , 'el9' ],
456+ local guest_config_builds = ['deb10' , 'el8' , 'el9' ],
473457 local guest_config_file_endings = [
474458 '-g1_all.deb' ,
475- '-g1.el7.noarch.rpm' ,
476459 '-g1.el8.noarch.rpm' ,
477460 '-g1.el9.noarch.rpm' ,
478461 ],
@@ -575,8 +558,8 @@ local pkggroup = {
575558 [common.gcsimgresource {
576559 image: image,
577560 gcs_dir: 'windows-uefi' ,
578- } for image in windows_client_images + windows_server_images + mirantis_images + docker_ce_images ] +
579- [common.gcsimgresource { image: image, gcs_dir: 'sqlserver-uefi' } for image in sql_images + prerelease_images ] +
561+ } for image in windows_client_images + windows_server_images] +
562+ [common.gcsimgresource { image: image, gcs_dir: 'sqlserver-uefi' } for image in sql_images] +
580563 [common.gcsimgresource { image: image, gcs_dir: 'windows-install-media' } for image in windows_install_media_images],
581564
582565 jobs: [
@@ -702,33 +685,6 @@ local pkggroup = {
702685 }
703686 for image in sql_images
704687 ] +
705- [
706- arle_publish_images_autopush {
707- image: image,
708- is_windows: true ,
709- gcs_dir: 'sqlserver-uefi' ,
710- workflow_dir: 'sqlserver' ,
711- }
712- for image in prerelease_images
713- ] +
714- [
715- arle_publish_images_autopush {
716- image: image,
717- is_windows: true ,
718- gcs_dir: 'windows-uefi' ,
719- workflow_dir: 'windows_container' ,
720- }
721- for image in docker_ce_images
722- ] +
723- [
724- arle_publish_images_autopush {
725- image: image,
726- is_windows: true ,
727- gcs_dir: 'windows-uefi' ,
728- workflow_dir: 'windows_container' ,
729- }
730- for image in mirantis_images
731- ] +
732688 [
733689 arle_publish_images_autopush {
734690 image: image,
@@ -748,8 +704,6 @@ local pkggroup = {
748704 imggroup { name: 'windows-client' , images: windows_client_images },
749705 imggroup { name: 'windows-server' , images: windows_server_images },
750706 imggroup { name: 'windows-sql' , images: sql_images },
751- imggroup { name: 'windows-container' , images: docker_ce_images + mirantis_images },
752- imggroup { name: 'windows-prerelease' , images: prerelease_images },
753707 imggroup { name: 'windows-install-media' , images: windows_install_media_images },
754708
755709 // Package groups
0 commit comments