Skip to content

Commit ef00983

Browse files
lj020326lj020326
committed
group updates to public branch
1 parent cd832ec commit ef00983

File tree

223 files changed

+4954
-4509
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

223 files changed

+4954
-4509
lines changed

‎.github/workflows/main.yml‎

Lines changed: 21 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -11,36 +11,39 @@ jobs:
1111
strategy:
1212
matrix:
1313
template:
14-
- name: Debian8
15-
build_distribution_config_dir: Debian
16-
build_release_config_dir: Debian/8/server
17-
- name: Debian9
18-
build_distribution_config_dir: Debian
19-
build_release_config_dir: Debian/9/server
20-
- name: Debian10
21-
build_distribution_config_dir: Debian
22-
build_release_config_dir: Debian/10/server
23-
- name: CentOS7
24-
build_distribution_config_dir: CentOS
25-
build_release_config_dir: CentOS/7/server
2614
- name: CentOS8
2715
build_distribution_config_dir: CentOS
2816
build_release_config_dir: CentOS/8/server
29-
- name: Ubuntu1804
30-
build_distribution_config_dir: Ubuntu
31-
build_release_config_dir: Ubuntu/18.04/server
32-
- name: Ubuntu2004
33-
build_distribution_config_dir: Ubuntu
34-
build_release_config_dir: Ubuntu/20.04/server
17+
- name: CentOS9
18+
build_distribution_config_dir: CentOS
19+
build_release_config_dir: CentOS/9/server
20+
- name: Debian11
21+
build_distribution_config_dir: Debian
22+
build_release_config_dir: Debian/11/server
23+
- name: Debian12
24+
build_distribution_config_dir: Debian
25+
build_release_config_dir: Debian/12/server
26+
- name: RHEL8
27+
build_distribution_config_dir: RHEL
28+
build_release_config_dir: RHEL/8/server
29+
- name: RHEL9
30+
build_distribution_config_dir: RHEL
31+
build_release_config_dir: RHEL/9/server
3532
- name: Ubuntu2204
3633
build_distribution_config_dir: Ubuntu
3734
build_release_config_dir: Ubuntu/22.04/server
35+
- name: Ubuntu2404
36+
build_distribution_config_dir: Ubuntu
37+
build_release_config_dir: Ubuntu/24.04/server
3838
- name: Windows2016
3939
build_distribution_config_dir: Windows
4040
build_release_config_dir: Windows/2016/server
4141
- name: Windows2019
4242
build_distribution_config_dir: Windows
4343
build_release_config_dir: Windows/2019/server
44+
- name: Windows2022
45+
build_distribution_config_dir: Windows
46+
build_release_config_dir: Windows/2022/server
4447

4548
name: Validate
4649
runs-on: ubuntu-latest

‎ansible‎

Submodule ansible updated 54 files

‎ensure-symlinks.sh‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,11 @@ REPO_SYMBOLIC_LINKS+=("templates/Ubuntu/env-vars.PROD.json.pkrvars.hcl:../env-va
3636
REPO_SYMBOLIC_LINKS+=("templates/Ubuntu/env-vars.QA.json.pkrvars.hcl:../env-vars.QA.json.pkrvars.hcl")
3737
REPO_SYMBOLIC_LINKS+=("templates/Ubuntu/common-build-vars.pkr.hcl:../common-build-vars.pkr.hcl")
3838

39+
REPO_SYMBOLIC_LINKS+=("templates/Debian/7:wheezy64")
40+
REPO_SYMBOLIC_LINKS+=("templates/Debian/8:jessie64")
41+
REPO_SYMBOLIC_LINKS+=("templates/Debian/9:stretch64")
42+
REPO_SYMBOLIC_LINKS+=("templates/Debian/10:buster64")
43+
3944
REPO_SYMBOLIC_LINKS+=("templates/Ubuntu/12.04:precise64")
4045
REPO_SYMBOLIC_LINKS+=("templates/Ubuntu/14.04:trusty64")
4146
REPO_SYMBOLIC_LINKS+=("templates/Ubuntu/14.10:utopic64")

‎templates/CentOS/10/server/box_info.large.json‎

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
{
2+
"vm_mem_size": "64000",
3+
"vm_disk_size": "140000",
4+
"vm_cpu_num": "4",
5+
"vm_cpu_cores_num": "2",
6+
"vm_template_type": "large",
7+
"box_name": "centos10-large",
8+
"box_tag": "dettonville/centos10-large",
9+
"description": "CentOS 9 - large template"
10+
}

‎templates/CentOS/10/server/box_info.large.json.pkrvars.hcl‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
vm_mem_size="64000"
2+
vm_disk_size="140000"
3+
vm_cpu_num="4"
4+
vm_cpu_cores_num="2"
5+
vm_template_type="large"
6+
box_name="centos10-large"
7+
box_tag="dettonville/centos10-large"
8+
description="CentOS 9 - large template"

‎templates/CentOS/10/server/box_info.medium.json‎

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
{
2+
"vm_mem_size": "16000",
3+
"vm_disk_size": "60000",
4+
"vm_cpu_num": "2",
5+
"vm_cpu_cores_num": "2",
6+
"vm_template_type": "medium",
7+
"box_name": "centos10-medium",
8+
"box_tag": "dettonville/centos10-medium",
9+
"description": "CentOS 9 - medium template"
10+
}

‎templates/CentOS/10/server/box_info.medium.json.pkrvars.hcl‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
vm_mem_size="16000"
2+
vm_disk_size="60000"
3+
vm_cpu_num="2"
4+
vm_cpu_cores_num="2"
5+
vm_template_type="medium"
6+
box_name="centos10-medium"
7+
box_tag="dettonville/centos10-medium"
8+
description="CentOS 9 - medium template"

‎templates/CentOS/10/server/box_info.small.json‎

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
{
2+
"vm_mem_size": "2000",
3+
"vm_disk_size": "20000",
4+
"vm_cpu_num": "2",
5+
"vm_cpu_cores_num": "1",
6+
"vm_template_type": "small",
7+
"vm_disk_partition_auto": "true",
8+
"box_name": "centos10-small",
9+
"box_tag": "dettonville/centos10-small",
10+
"description": "CentOS 9 - small template"
11+
}

‎templates/CentOS/10/server/box_info.small.json.pkrvars.hcl‎

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
vm_mem_size="2000"
2+
vm_disk_size="20000"
3+
vm_cpu_num="2"
4+
vm_cpu_cores_num="1"
5+
vm_template_type="small"
6+
vm_disk_partition_auto="true"
7+
box_name="centos10-small"
8+
box_tag="dettonville/centos10-small"
9+
description="CentOS 9 - small template"

templates/CentOS/7/server/build.sh renamed to templates/CentOS/10/server/build.sh

File renamed without changes.

0 commit comments

Comments
 (0)