Skip to content

Commit 668f761

Browse files
nickandersonnickanderson
authored
Merge pull request #1770 from nickanderson/ENT-6010/master
ENT-6010/master: Aligned unattended self upgrade package map with current state
2 parents f051c51 + 572434c commit 668f761

1 file changed

Lines changed: 64 additions & 112 deletions

File tree

‎standalone_self_upgrade.cf.in‎

Lines changed: 64 additions & 112 deletions
Original file line numberDiff line numberDiff line change
@@ -396,81 +396,49 @@ bundle common cfengine_package_names
396396
"pkg_release" string => "$(cfengine_software.pkg_release)";
397397
"pkg_arch" string => "$(cfengine_software.pkg_arch)";
398398

399-
# Redhat/Centos 4, 5 use the same package
399+
# Redhat/Centos/Oracle 5, SLES 11 use the same package
400400

401-
"pkg[redhat_5_x86_64]" string => "$(pkg_name)-$(pkg_version)-$(pkg_release).el4.x86_64.rpm";
401+
"pkg[redhat_5_x86_64]" string => "$(pkg_name)-$(pkg_version)-$(pkg_release).el5.centos.x86_64.rpm";
402402
"pkg[centos_5_x86_64]" string => "$(pkg[redhat_5_x86_64])";
403403
"pkg[oracle_5_x86_64]" string => "$(pkg[redhat_5_x86_64])";
404404
"pkg[SuSE_11_x86_64]" string => "$(pkg[redhat_5_x86_64])";
405-
"pkg[SuSE_10_x86_64]" string => "$(pkg[redhat_5_x86_64])";
406405

407406
# 32bit RPMs
408-
"pkg[redhat_5_i386]" string => "$(pkg_name)-$(pkg_version)-$(pkg_release).el4.i386.rpm";
409-
"pkg[redhat_5_i586]" string => "$(pkg[redhat_5_i386])";
410-
"pkg[redhat_5_i686]" string => "$(pkg[redhat_5_i386])";
411-
"pkg[centos_5_i386]" string => "$(pkg[redhat_5_i386])";
412-
"pkg[centos_5_i586]" string => "$(pkg[redhat_5_i386])";
413-
"pkg[centos_5_i686]" string => "$(pkg[redhat_5_i386])";
414-
"pkg[centos_6_i386]" string => "$(pkg[redhat_5_i386])";
415-
"pkg[redhat_6_i386]" string => "$(pkg[redhat_5_i386])";
416-
"pkg[redhat_6_i586]" string => "$(pkg[redhat_5_i386])";
417-
"pkg[redhat_6_i686]" string => "$(pkg[redhat_5_i386])";
418-
"pkg[centos_7_i386]" string => "$(pkg[redhat_5_i386])";
419-
"pkg[centos_7_i586]" string => "$(pkg[redhat_5_i386])";
420-
"pkg[centos_7_i686]" string => "$(pkg[redhat_5_i386])";
421-
"pkg[SuSE_11_i386]" string => "$(pkg[redhat_5_i386])";
422-
"pkg[SuSE_10_i386]" string => "$(pkg[redhat_5_i386])";
423-
424-
# Redhat/Centos 6, 7 use the same package
407+
"pkg[$(cfengine_master_software_content._rpm_dists)_$(cfengine_master_software_content._32bit_arches)]" string => "$(pkg_name)-$(pkg_version)-$(pkg_release).el5.centos.i386.rpm";
408+
409+
# Redhat/Centos/Oracle 6, SLES 12-15 use the same package
425410

426411
"pkg[redhat_6_x86_64]" string => "$(pkg_name)-$(pkg_version)-$(pkg_release).el6.x86_64.rpm";
427412
"pkg[centos_6_x86_64]" string => "$(pkg[redhat_6_x86_64])";
428413
"pkg[oracle_6_x86_64]" string => "$(pkg[redhat_6_x86_64])";
429-
"pkg[redhat_7_x86_64]" string => "$(pkg[redhat_6_x86_64])";
430-
"pkg[centos_7_x86_64]" string => "$(pkg[redhat_6_x86_64])";
431-
"pkg[oracle_7_x86_64]" string => "$(pkg[redhat_6_x86_64])";
414+
"pkg[SuSE_12_x86_64]" string => "$(pkg[redhat_6_x86_64])";
415+
"pkg[SuSE_15_x86_64]" string => "$(pkg[redhat_6_x86_64])";
416+
417+
# Redhat/Centos/Oracle 7 use the same package
418+
"pkg[redhat_7_x86_64]" string => "$(pkg_name)-$(pkg_version)-$(pkg_release).el7.x86_64.rpm";
419+
"pkg[centos_7_x86_64]" string => "$(pkg[redhat_7_x86_64])";
420+
"pkg[oracle_7_x86_64]" string => "$(pkg[redhat_7_x86_64])";
421+
422+
# Redhat/Centos/Oracle 8 use the same package
423+
"pkg[redhat_8_x86_64]" string => "$(pkg_name)-$(pkg_version)-$(pkg_release).el8.x86_64.rpm";
424+
"pkg[centos_8_x86_64]" string => "$(pkg[redhat_8_x86_64])";
425+
"pkg[oracle_8_x86_64]" string => "$(pkg[redhat_8_x86_64])";
432426

433-
# Debian 7, 8, 9 and Ubuntu 14, 16, 18 use the same package
427+
# 64bit Debian
434428

435-
"pkg[debian_7_x86_64]" string => "$(pkg_name)_$(pkg_version)-$(pkg_release)_amd64-debian7.deb";
436-
"pkg[debian_8_x86_64]" string => "$(pkg[debian_7_x86_64])";
437-
"pkg[debian_9_x86_64]" string => "$(pkg[debian_7_x86_64])";
438-
"pkg[ubuntu_14_x86_64]" string => "$(pkg[debian_7_x86_64])";
439-
"pkg[ubuntu_16_x86_64]" string => "$(pkg[debian_7_x86_64])";
440-
"pkg[ubuntu_18_x86_64]" string => "$(pkg[debian_7_x86_64])";
429+
"pkg[debian_7_x86_64]" string => "$(pkg_name)_$(pkg_version)-$(pkg_release).debian7_amd64.deb";
430+
"pkg[debian_8_x86_64]" string => "$(pkg_name)_$(pkg_version)-$(pkg_release).debian8_amd64.deb";
431+
"pkg[debian_9_x86_64]" string => "$(pkg_name)_$(pkg_version)-$(pkg_release).debian9_amd64.deb";
432+
"pkg[debian_10_x86_64]" string => "$(pkg_name)_$(pkg_version)-$(pkg_release).debian10_amd64.deb";
433+
434+
# 64bit Ubuntu
435+
"pkg[ubuntu_14_x86_64]" string => "$(pkg_name)_$(pkg_version)-$(pkg_release).ubuntu14_amd64.deb";
436+
"pkg[ubuntu_16_x86_64]" string => "$(pkg_name)_$(pkg_version)-$(pkg_release).ubuntu16_amd64.deb";
437+
"pkg[ubuntu_18_x86_64]" string => "$(pkg_name)_$(pkg_version)-$(pkg_release).ubuntu18_amd64.deb";
441438

442439
# 32bit DEBs
443-
"pkg[debian_4_i386]" string => "$(pkg_name)_$(pkg_version)-$(pkg_release)_i386-debian4.deb";
444-
"pkg[debian_4_i586]" string => "$(pkg[debian_4_i386])";
445-
"pkg[debian_4_i686]" string => "$(pkg[debian_4_i386])";
446-
"pkg[debian_5_i386]" string => "$(pkg[debian_4_i386])";
447-
"pkg[debian_5_i586]" string => "$(pkg[debian_4_i386])";
448-
"pkg[debian_5_i686]" string => "$(pkg[debian_4_i386])";
449-
"pkg[debian_6_i386]" string => "$(pkg[debian_4_i386])";
450-
"pkg[debian_6_i586]" string => "$(pkg[debian_4_i386])";
451-
"pkg[debian_6_i686]" string => "$(pkg[debian_4_i386])";
452-
"pkg[debian_7_i386]" string => "$(pkg[debian_4_i386])";
453-
"pkg[debian_7_i586]" string => "$(pkg[debian_4_i386])";
454-
"pkg[debian_7_i686]" string => "$(pkg[debian_4_i386])";
455-
"pkg[debian_8_i386]" string => "$(pkg[debian_4_i386])";
456-
"pkg[debian_8_i586]" string => "$(pkg[debian_4_i386])";
457-
"pkg[debian_8_i686]" string => "$(pkg[debian_4_i386])";
458-
"pkg[debian_9_i386]" string => "$(pkg[debian_4_i386])";
459-
"pkg[debian_9_i586]" string => "$(pkg[debian_4_i386])";
460-
"pkg[debian_9_i686]" string => "$(pkg[debian_4_i386])";
461-
"pkg[ubuntu_12_i386]" string => "$(pkg[debian_4_i386])";
462-
"pkg[ubuntu_12_i586]" string => "$(pkg[debian_4_i386])";
463-
"pkg[ubuntu_12_i686]" string => "$(pkg[debian_4_i386])";
464-
"pkg[ubuntu_14_i386]" string => "$(pkg[debian_4_i386])";
465-
"pkg[ubuntu_14_i586]" string => "$(pkg[debian_4_i386])";
466-
"pkg[ubuntu_14_i686]" string => "$(pkg[debian_4_i386])";
467-
"pkg[ubuntu_16_i386]" string => "$(pkg[debian_4_i386])";
468-
"pkg[ubuntu_16_i586]" string => "$(pkg[debian_4_i386])";
469-
"pkg[ubuntu_16_i686]" string => "$(pkg[debian_4_i386])";
470-
"pkg[ubuntu_18_i386]" string => "$(pkg[debian_4_i386])";
471-
"pkg[ubuntu_18_i586]" string => "$(pkg[debian_4_i386])";
472-
"pkg[ubuntu_18_i686]" string => "$(pkg[debian_4_i386])";
473440

441+
"pkg[$(cfengine_master_software_content._deb_dists)_$(cfengine_master_software_content._32bit_arches)]" string => "$(pkg_name)_$(pkg_version)-$(pkg_release).debian7_i386.deb";
474442

475443
"my_pkg"
476444
string => "$(pkg[$(sys.flavor)_$(sys.arch)])",
@@ -498,70 +466,54 @@ bundle agent cfengine_master_software_content
498466
# Map platform/directory identifier to upstream package URLs
499467
# Better to read in an external explicit data structure?
500468

501-
# Redhat/Centos 4, 5 and SuSE 10, 11 all use the same package
469+
"_32bit_arches" slist => { "i386", "i586", "i686" };
470+
471+
# Redhat/Centos/Oracle 5 and SuSE 11 all use the same package
502472
"dir[redhat_5_x86_64]" string => "agent_rpm_x86_64";
503473
"dir[centos_5_x86_64]" string => "$(dir[redhat_5_x86_64])";
504474
"dir[oracle_5_x86_64]" string => "$(dir[redhat_5_x86_64])";
505475
"dir[SuSE_11_x86_64]" string => "$(dir[redhat_5_x86_64])";
506-
"dir[SuSE_10_x86_64]" string => "$(dir[redhat_5_x86_64])";
507476

508477
# All 32bit rpms use the same package
509-
"dir[redhat_5_i386]" string => "agent_rpm_i386";
510-
"dir[centos_5_i386]" string => "$(dir[redhat_5_i386])";
511-
"dir[centos_5_i586]" string => "$(dir[redhat_5_i386])";
512-
"dir[centos_5_i686]" string => "$(dir[redhat_5_i386])";
513-
"dir[centos_6_i386]" string => "$(dir[redhat_5_i386])";
514-
"dir[centos_6_i586]" string => "$(dir[redhat_5_i386])";
515-
"dir[centos_6_i686]" string => "$(dir[redhat_5_i386])";
516-
"dir[redhat_6_i386]" string => "$(dir[redhat_5_i386])";
517-
"dir[redhat_6_i586]" string => "$(dir[redhat_5_i386])";
518-
"dir[redhat_6_i686]" string => "$(dir[redhat_5_i386])";
519-
"dir[centos_7_i386]" string => "$(dir[redhat_5_i386])";
520-
"dir[centos_7_i586]" string => "$(dir[redhat_5_i386])";
521-
"dir[centos_7_i686]" string => "$(dir[redhat_5_i386])";
522-
"dir[SuSE_11_i386]" string => "$(dir[redhat_5_i386])";
523-
"dir[SuSE_10_i386]" string => "$(dir[redhat_5_i386])";
524-
525-
# Redhat/Centos 6, 7 use the same package
478+
"_rpm_dists" slist => { "redhat_5", "redhat_6", "redhat_7",
479+
"centos_5", "centos_6", "centos_7",
480+
"SuSE_11", "SuSE_10" };
526481

482+
"dir[$(_rpm_dists)_$(_32bit_arches)]" string => "agent_rpm_i386";
483+
484+
# Redhat/Centos/Oracle 6 use the same package
527485
"dir[redhat_6_x86_64]" string => "agent_rhel6_x86_64";
528486
"dir[centos_6_x86_64]" string => "$(dir[redhat_6_x86_64])";
529487
"dir[oracle_6_x86_64]" string => "$(dir[redhat_6_x86_64])";
530-
"dir[redhat_7_x86_64]" string => "$(dir[redhat_6_x86_64])";
531-
"dir[centos_7_x86_64]" string => "$(dir[redhat_6_x86_64])";
532-
"dir[oracle_7_x86_64]" string => "$(dir[redhat_6_x86_64])";
533488

534-
# Debian 7, 8 and Ubuntu 14, 16 use the same package
535-
"dir[debian_7_x86_64]" string => "agent_debian7_x86_64";
536-
"dir[debian_8_x86_64]" string => "$(dir[debian_7_x86_64])";
537-
"dir[ubuntu_14_x86_64]" string => "$(dir[debian_7_x86_64])";
538-
"dir[ubuntu_16_x86_64]" string => "$(dir[debian_7_x86_64])";
489+
# Redhat/Centos/Oracle 7 use the same package
490+
"dir[redhat_7_x86_64]" string => "agent_rhel7_x86_64";
491+
"dir[centos_7_x86_64]" string => "$(dir[redhat_7_x86_64])";
492+
"dir[oracle_7_x86_64]" string => "$(dir[redhat_7_x86_64])";
493+
494+
# Redhat/Centos/Oracle 8 use the same package
495+
"dir[redhat_8_x86_64]" string => "agent_rhel8_x86_64";
496+
"dir[centos_8_x86_64]" string => "$(dir[redhat_8_x86_64])";
497+
"dir[oracle_8_x86_64]" string => "$(dir[redhat_8_x86_64])";
498+
499+
# Debian
500+
"dir[debian_7_x86_64]" string => "agent_deb_x86_64";
501+
"dir[debian_8_x86_64]" string => "agent_debian8_x86_64";
502+
"dir[debian_9_x86_64]" string => "agent_debian9_x86_64";
503+
"dir[debian_10_x86_64]" string => "agent_debian10_x86_64";
504+
505+
# Ubuntu
506+
"dir[ubuntu_14_x86_64]" string => "agent_ubuntu14_x86_64";
507+
"dir[ubuntu_16_x86_64]" string => "agent_ubuntu16_x86_64";
508+
"dir[ubuntu_18_x86_64]" string => "agent_ubuntu18_x86_64";
539509

540510
# All 32bit debs use the same package
541-
"dir[debian_4_i386]" string => "agent_deb_i386";
542-
"dir[debian_4_i586]" string => "$(dir[debian_4_i386])";
543-
"dir[debian_4_i686]" string => "$(dir[debian_4_i386])";
544-
"dir[debian_5_i386]" string => "$(dir[debian_4_i386])";
545-
"dir[debian_5_i586]" string => "$(dir[debian_4_i386])";
546-
"dir[debian_5_i686]" string => "$(dir[debian_4_i386])";
547-
"dir[debian_6_i386]" string => "$(dir[debian_4_i386])";
548-
"dir[debian_6_i586]" string => "$(dir[debian_4_i386])";
549-
"dir[debian_6_i686]" string => "$(dir[debian_4_i386])";
550-
"dir[debian_7_i386]" string => "$(dir[debian_4_i386])";
551-
"dir[debian_7_i586]" string => "$(dir[debian_4_i386])";
552-
"dir[debian_7_i686]" string => "$(dir[debian_4_i386])";
553-
"dir[debian_8_i386]" string => "$(dir[debian_4_i386])";
554-
"dir[debian_8_i586]" string => "$(dir[debian_4_i386])";
555-
"dir[debian_8_i686]" string => "$(dir[debian_4_i386])";
556-
"dir[debian_9_i386]" string => "$(dir[debian_4_i386])";
557-
"dir[debian_9_i586]" string => "$(dir[debian_4_i386])";
558-
"dir[debian_9_i686]" string => "$(dir[debian_4_i386])";
559-
"dir[ubuntu_14_i386]" string => "$(dir[debian_4_i386])";
560-
"dir[ubuntu_14_i586]" string => "$(dir[debian_4_i386])";
561-
"dir[ubuntu_14_i686]" string => "$(dir[debian_4_i386])";
562-
"dir[ubuntu_16_i386]" string => "$(dir[debian_4_i386])";
563-
"dir[ubuntu_16_i586]" string => "$(dir[debian_4_i386])";
564-
"dir[ubuntu_16_i686]" string => "$(dir[debian_4_i386])";
511+
"_deb_dists" slist => { "debian_4", "debian_5", "debian_6",
512+
"debian_7", "debian_8", "debian_9",
513+
"debian_10", "ubuntu_14", "ubuntu_16",
514+
"ubuntu_18" };
515+
516+
"dir[$(_deb_dists)_$(_32bit_arches)]" string => "agent_deb_i386";
565517

566518
"platform_dir" slist => getindices( dir );
567519
"download_dir" string => "$(sys.workdir)/master_software_updates";
@@ -579,7 +531,7 @@ bundle agent cfengine_master_software_content
579531

580532
reports:
581533
DEBUG|DEBUG_cfengine_master_software_content::
582-
"curl -s $(base_url)/$(dir[$(i)])/$(cfengine_package_names.pkg[$(i)]) --output $(download_dir)/$(i)/$(cfengine_package_names.pkg[$(i)])";
534+
"curl -s $(base_url)/$(dir[$(platform_dir)])/$(cfengine_package_names.pkg[$(platform_dir)]) --output $(download_dir)/$(platform_dir)/$(cfengine_package_names.pkg[$(platform_dir)])";
583535
}
584536

585537
bundle edit_line u_backup_script

0 commit comments

Comments
 (0)