Version 1.4.4

marcinbojko · Nov 17, 2020 · d5f4460 · d5f4460
1 parent e3a3638
commit d5f4460
Show file tree

Hide file tree

Showing 12 changed files with 150 additions and 121 deletions.
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
@@ -1,5 +1,5 @@
 variables:
-  packer_version: "1.6.0"
+  packer_version: "1.6.5"
   dind: 19.03-dind
 stages:
   - get-packer
@@ -26,42 +26,42 @@ get-packer:
   tags:
     - docker
     - shared
-centos77:
+centos79:
   stage: centos7-packer-validate
   image: alpine
   services:
     - docker:$dind
   before_script:
     - export template_file="./templates/hv_centos7_g2.json"
-    - export var_file="./variables/variables_centos77.json"
+    - export var_file="./variables/variables_centos79.json"
   script:
     - ./packer version --version
     - ./packer validate -var-file="$var_file" "$template_file"
   tags:
     - docker
     - shared
-centos77-docker:
+centos79-docker:
   stage: centos7-packer-validate
   image: alpine
   services:
     - docker:$dind
   before_script:
     - export template_file="./templates/hv_centos7_g2_docker.json"
-    - export var_file="./variables/variables_centos77.json"
+    - export var_file="./variables/variables_centos79.json"
   script:
     - ./packer version --version
     - ./packer validate -var-file="$var_file" "$template_file"
   tags:
     - docker
     - shared
-centos77-vagrant:
+centos79-vagrant:
   stage: centos7-packer-validate
   image: alpine
   services:
     - docker:$dind
   before_script:
     - export template_file="./templates/hv_centos7_g2_vagrant.json"
-    - export var_file="./variables/variables_centos77.json"
+    - export var_file="./variables/variables_centos79.json"
   script:
     - ./packer version --version
     - ./packer validate -var-file="$var_file" "$template_file"

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,14 @@
 # Changelog
 
+## Version 1.4.4 2020-11-17
+
+* [CentOS] added added `CentOS 7.9` support
+* [CentOS] added added `CentOS 7.9 Docker` support
+* [CentOS] added added `CentOS 7.9 Vagrant` support
+* [CentOS] `CentOS 7.8` doesn't update OS by default anymore
+* [Windows]  upgrade `puppet-agent` package to version 5.5.22
+* [Extra] smaller adjusts in `extra`
+
 ## Version 1.4.3 2020-09-25
 
 * [CentOS] bump SystemCenter Agent to 1.0.3.1028

diff --git a/README.md b/README.md
diff --git a/extra/scripts/phase-2.ps1 b/extra/scripts/phase-2.ps1
@@ -27,6 +27,7 @@ Write-Output "Phase 2 [START] - Start of Phase 2"
     $goterror=1
   }
   choco feature enable -n allowEmptyChecksums
+  choco feature enable -name=usePackageExitCodes
   Write-Output "Phase 2 [INFO] - Chocolatey packagess installing, $packages_count to go"
   #safely install packages
   foreach ($package in $packages) {

diff --git a/extra/scripts/phase-3.ps1 b/extra/scripts/phase-3.ps1
@@ -4,7 +4,7 @@
 param(
     [Parameter()]
     [ValidateNotNullOrEmpty()]
-    [string]$Version="5.5.21",
+    [string]$Version="5.5.22",
     [Parameter()]
     [ValidateNotNullOrEmpty()]
     [ValidateSet('true','false','$true','$false','0','1')]

diff --git a/hv_centos77.ps1 → hv_centos79.ps1 b/hv_centos77.ps1 → hv_centos79.ps1
@@ -5,8 +5,8 @@ $startDTM = (Get-Date)
 
 # Variables
 $template_file="./templates/hv_centos7_g2.json"
-$var_file="./variables/variables_centos77.json"
-$machine="CentOS 7.7 1908"
+$var_file="./variables/variables_centos79.json"
+$machine="CentOS 7.9 2009"
 $packer_log=0
 
 if ((Test-Path -Path "$template_file") -and (Test-Path -Path "$var_file")) {

diff --git a/hv_centos77_docker.ps1 → hv_centos79_docker.ps1 b/hv_centos77_docker.ps1 → hv_centos79_docker.ps1
@@ -5,8 +5,8 @@ $startDTM = (Get-Date)
 
 # Variables
 $template_file="./templates/hv_centos7_g2_docker.json"
-$var_file="./variables/variables_centos77.json"
-$machine="CentOS 7.7 1908 Docker"
+$var_file="./variables/variables_centos79.json"
+$machine="CentOS 7.9 2009 Docker"
 $packer_log=0
 
 if ((Test-Path -Path "$template_file") -and (Test-Path -Path "$var_file")) {

diff --git a/hv_centos77_vagrant.ps1 → hv_centos79_vagrant.ps1 b/hv_centos77_vagrant.ps1 → hv_centos79_vagrant.ps1
@@ -5,8 +5,8 @@ $startDTM = (Get-Date)
 
 # Variables
 $template_file="./templates/hv_centos7_g2_vagrant.json"
-$var_file="./variables/variables_centos77.json"
-$machine="CentOS 7.7 1908 Vagrant"
+$var_file="./variables/variables_centos79.json"
+$machine="CentOS 7.9 2009 Vagrant"
 $packer_log=0
 
 if ((Test-Path -Path "$template_file") -and (Test-Path -Path "$var_file")) {
@@ -26,7 +26,7 @@ if ((Test-Path -Path "$template_file") -and (Test-Path -Path "$var_file")) {
     packer build --force -var-file="$var_file" "$template_file"
     if ($?) {
       Write-Output "Calculating checksums"
-      Get-FileHash -Algorithm SHA256 -Path "./vbox/packer-centos-77-g2.box"|Out-File "./vbox/packer-centos-77-g2.box.sha256" -Verbose
+      Get-FileHash -Algorithm SHA256 -Path "./vbox/packer-centos-79-g2.box"|Out-File "./vbox/packer-centos-79-g2.box.sha256" -Verbose
     }
   }
   catch {

diff --git a/vagrant/hv_centos76_g2.template b/vagrant/hv_centos76_g2.template
diff --git a/vagrant/hv_centos77_g2.template → vagrant/hv_centos79_g2.template b/vagrant/hv_centos77_g2.template → vagrant/hv_centos79_g2.template
@@ -4,8 +4,8 @@
 Vagrant.require_version ">= 1.6.2"
 
 Vagrant.configure("2") do |config|
-    config.vm.define "vagrant-centos77"
-    config.vm.box = "centos77"
+    config.vm.define "vagrant-centos79"
+    config.vm.box = "centos79"
     config.vm.communicator = "ssh"
     config.vm.synced_folder ".", "/vagrant", type: "rsync", disabled: "true"
 

diff --git a/variables/variables_centos78.json b/variables/variables_centos78.json
@@ -11,6 +11,6 @@
     "vlan_id": "",
     "vagrantfile_template": "./vagrant/hv_centos78_g2.template",
     "ssh_password": "password",
-    "provision_script_options": "",
+    "provision_script_options": "-u false",
     "boot_command": "c  setparams 'kickstart' <enter> linuxefi /images/pxeboot/vmlinuz inst.stage2=hd:LABEL=CentOS\\x207\\x20x\\86_64 inst.ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/gen2-centos/ks.cfg<enter> initrdefi /images/pxeboot/initrd.img<enter> boot<enter>"
   }
diff --git a/variables/variables_centos77.json → variables/variables_centos79.json b/variables/variables_centos77.json → variables/variables_centos79.json
@@ -1,16 +1,16 @@
 {
-    "iso_url":  "http://ftp.ps.pl/pub/Linux/CentOS/7.7.1908/isos/x86_64/CentOS-7-x86_64-Everything-1908.iso",
+    "iso_url": "http://centos.slaskdatacenter.com/7.9.2009/isos/x86_64/CentOS-7-x86_64-Everything-2009.iso",
     "iso_checksum_type": "sha256",
-    "iso_checksum": "bd5e6ca18386e8a8e0b5a9e906297b5610095e375e4d02342f07f32022b13acf",
-    "vm_name": "packer-centos77-g2",
+    "iso_checksum": "689531cce9cf484378481ae762fae362791a9be078fda10e4f6977bf8fa71350",
+    "vm_name": "packer-centos79-g2",
     "disk_size": "70000",
     "disk_additional_size":"150000",
     "switch_name": "vSwitch",
-    "output_directory": "output-centos77",
-    "output_vagrant": "./vbox/packer-centos-77-g2.box",
+    "output_directory": "output-centos79",
+    "output_vagrant": "./vbox/packer-centos-79-g2.box",
     "vlan_id": "",
-    "vagrantfile_template": "./vagrant/hv_centos77_g2.template",
+    "vagrantfile_template": "./vagrant/hv_centos79_g2.template",
     "ssh_password": "password",
-    "provision_script_options": "-u false",
+    "provision_script_options": "",
     "boot_command": "c  setparams 'kickstart' <enter> linuxefi /images/pxeboot/vmlinuz inst.stage2=hd:LABEL=CentOS\\x207\\x20x\\86_64 inst.ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/gen2-centos/ks.cfg<enter> initrdefi /images/pxeboot/initrd.img<enter> boot<enter>"
   }