Skip to content

Commit f24db42

Browse files
bhlohumibhlohumi
committed
Automation Toolkit Release v2024.2.1
1 parent 2fb8eaf commit f24db42

Some content is hidden

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

61 files changed

+1769
-1933
lines changed

‎Dockerfile

Lines changed: 33 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -1,56 +1,58 @@
1-
FROM oraclelinux:7-slim
1+
FROM oraclelinux:9-slim
22
LABEL maintainer="Team at Oracle"
33
LABEL description="OCI format to generate CD3 image"
44

55
ARG USERNAME=cd3user
66
ARG USER_UID=1001
77
ARG USER_GID=$USER_UID
88

9-
RUN yum install sudo -y && groupadd --gid $USER_GID $USERNAME \
10-
&& useradd --uid $USER_UID --gid $USER_GID -d /$USERNAME -m $USERNAME \
11-
&& echo $USERNAME ALL=\(root\) NOPASSWD:ALL > /etc/sudoers.d/$USERNAME \
12-
&& chmod 0440 /etc/sudoers.d/$USERNAME \
13-
&& mkdir -p /cd3user/tenancies && sudo chown -R $USERNAME:$USERNAME /cd3user/tenancies/ \
14-
&& yum install -y vim && echo 'alias vi="vim"' >> /etc/bashrc
15-
9+
RUN microdnf install -y sudo && \
10+
groupadd --gid $USER_GID $USERNAME && \
11+
useradd --uid $USER_UID --gid $USER_GID -d /$USERNAME -m $USERNAME && \
12+
echo $USERNAME ALL=\(root\) NOPASSWD:ALL > /etc/sudoers.d/$USERNAME && \
13+
chmod 0440 /etc/sudoers.d/$USERNAME && \
14+
mkdir -p /cd3user/tenancies && \
15+
chown -R $USERNAME:$USERNAME /cd3user/tenancies/ && \
16+
microdnf install -y vim && \
17+
microdnf install -y dnf && \
18+
echo 'alias vi="vim"' >> /etc/bashrc
1619

1720
USER $USERNAME
1821
WORKDIR /cd3user/oci_tools/
1922
COPY cd3_automation_toolkit cd3_automation_toolkit/
2023

2124
WORKDIR /cd3user/
2225

23-
RUN sudo yum install -y oracle-softwarecollection-release-el7 \
24-
&& sudo chown -R $USERNAME:$USERNAME /cd3user/
25-
26-
RUN sudo sed -i -e 's/\r$//' /cd3user/oci_tools/cd3_automation_toolkit/shell_script.sh \
27-
&& bash /cd3user/oci_tools/cd3_automation_toolkit/shell_script.sh \
28-
&& sudo chown -R cd3user:cd3user /cd3user/ && sudo yum clean all && sudo rm -rf /var/cache/yum \
29-
&& sudo chmod -R 740 /cd3user/
26+
RUN sudo dnf install -y oraclelinux-release-el9 && \
27+
sudo chown -R $USERNAME:$USERNAME /cd3user/ && \
28+
sudo sed -i -e 's/\r$//' /cd3user/oci_tools/cd3_automation_toolkit/shell_script.sh && \
29+
bash /cd3user/oci_tools/cd3_automation_toolkit/shell_script.sh && \
30+
sudo chown -R cd3user:cd3user /cd3user/ && \
31+
sudo dnf clean all && \
32+
sudo rm -rf /var/cache/dnf && \
33+
sudo chmod -R 740 /cd3user/
3034

3135

3236
##################################### START INSTALLING JENKINS ###################################
33-
ARG JENKINS_VERSION=2.401.1
34-
ARG JENKINS_SHA=600b73eabf797852e39919541b84f7686ff601b97c77b44eb00843eb91c7dd6c
37+
ARG JENKINS_VERSION=2.444
38+
ARG JENKINS_SHA=ab093a455fc35951c9b46361002e17cc3ed7c59b0943bbee3a57a363f3370d2e
3539
ARG JENKINS_PLUGIN_MANAGER_VERSION=2.12.13
3640
ARG PLUGIN_CLI_URL=https://github.com/jenkinsci/plugin-installation-manager-tool/releases/download/${JENKINS_PLUGIN_MANAGER_VERSION}/jenkins-plugin-manager-${JENKINS_PLUGIN_MANAGER_VERSION}.jar
3741

3842
ARG JENKINS_HOME=/cd3user/tenancies/jenkins_home
3943
ARG JENKINS_INSTALL=/usr/share/jenkins
4044
ARG REF=/usr/share/jenkins/ref
4145

42-
RUN sudo yum remove java-1.8.0-openjdk-1.8.0.345.b01-1.el7_9.x86_64 \
43-
&& sudo yum install -y java-11-openjdk \
44-
&& sudo yum install -y java-11-openjdk-devel \
45-
&& sudo yum install unzip -y \
46-
&& sudo yum install git -y \
47-
&& sudo mkdir -p ${REF}/init.groovy.d \
48-
&& sudo chown -R cd3user:cd3user ${JENKINS_INSTALL} \
49-
&& sudo curl -fsSL http://updates.jenkins-ci.org/download/war/${JENKINS_VERSION}/jenkins.war -o ${JENKINS_INSTALL}/jenkins.war \
50-
&& echo "${JENKINS_SHA} ${JENKINS_INSTALL}/jenkins.war" | sha256sum -c - \
51-
&& sudo curl -fsSL ${PLUGIN_CLI_URL} -o ${JENKINS_INSTALL}/jenkins-plugin-manager.jar
46+
RUN sudo microdnf install -y java-21-openjdk && \
47+
sudo microdnf install -y java-21-openjdk-devel && \
48+
sudo microdnf install git-2.39.3 -y && \
49+
sudo mkdir -p ${REF}/init.groovy.d && \
50+
sudo chown -R cd3user:cd3user ${JENKINS_INSTALL} && \
51+
sudo curl -fsSL http://updates.jenkins-ci.org/download/war/${JENKINS_VERSION}/jenkins.war -o ${JENKINS_INSTALL}/jenkins.war && \
52+
echo "${JENKINS_SHA} ${JENKINS_INSTALL}/jenkins.war" | sha256sum -c - && \
53+
sudo curl -fsSL ${PLUGIN_CLI_URL} -o ${JENKINS_INSTALL}/jenkins-plugin-manager.jar
5254

53-
ENV JAVA_HOME /usr/lib/jvm/java-11-openjdk-11.0.17.0.8-2.el8_6.x86_64
55+
ENV JAVA_HOME /usr/lib/jvm/java-21-openjdk
5456
ENV JENKINS_HOME ${JENKINS_HOME}
5557
ENV JENKINS_INSTALL ${JENKINS_INSTALL}
5658
ENV REF ${REF}
@@ -65,7 +67,6 @@ COPY --chown=cd3user:cd3user jenkins_install ${JENKINS_INSTALL}/
6567
COPY --chown=cd3user:cd3user jenkins_install/init/*.groovy ${REF}/init.groovy.d/
6668
COPY --chown=cd3user:cd3user jenkins_install/plugins.txt ${REF}/plugins.txt
6769

68-
69-
RUN sudo java -jar ${JENKINS_INSTALL}/jenkins-plugin-manager.jar --war ${JENKINS_INSTALL}/jenkins.war --verbose -f ${REF}/plugins.txt \
70-
&& sudo chown -R cd3user:cd3user ${JENKINS_INSTALL} \
71-
&& sudo chmod +x ${JENKINS_INSTALL}/jenkins.sh
70+
RUN sudo java -jar ${JENKINS_INSTALL}/jenkins-plugin-manager.jar --war ${JENKINS_INSTALL}/jenkins.war --verbose -f ${REF}/plugins.txt && \
71+
sudo chown -R cd3user:cd3user ${JENKINS_INSTALL} && \
72+
sudo chmod +x ${JENKINS_INSTALL}/jenkins.sh

‎OCIWorkVMStack/data_sources.tf

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -19,16 +19,17 @@ data "oci_identity_compartment" "compartment" {
1919

2020
data "oci_core_images" "oracle_linux" {
2121
compartment_id = var.tenancy_ocid
22-
operating_system = "Oracle Linux"
23-
shape = var.instance_shape
22+
#operating_system = "Oracle Linux"
23+
#shape = var.instance_shape
24+
display_name = var.instance_os_version
2425
sort_by = "TIMECREATED"
2526
sort_order = "DESC"
2627
state = "AVAILABLE"
2728

2829
# filter restricts to OL
29-
filter {
30-
name = "operating_system_version"
31-
values = ["${local.os_version}"]
32-
regex = false
33-
}
30+
#filter {
31+
# name = "operating_system_version"
32+
# values = ["${local.os_version}"]
33+
# regex = false
34+
#}
3435
}

‎OCIWorkVMStack/installToolkit.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@ echo "********************************************************" >> $logfile 2>&1
6767
echo "########################################################" >> $logfile 2>&1
6868
echo "Downloading CD3 Automation Toolkit Code from Github " >> $logfile 2>&1
6969
echo "########################################################" >> $logfile 2>&1
70-
sudo git clone https://github.com/oracle-devrel/cd3-automation-toolkit.git $toolkit_dir >> $logfile 2>&1
70+
sudo git clone https://github.com/oracle-devrel/cd3-automation-toolkit.git -b develop $toolkit_dir >> $logfile 2>&1
7171
stop_exec
7272
sudo ls -la /tmp/githubCode >> $logfile 2>&1
7373
echo "Downloading CD3 Automation Toolkit Code from Github completed successfully" >> $logfile 2>&1

‎OCIWorkVMStack/locals.tf

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ locals {
1919
listing_resource_id = var.mp_listing_resource_id
2020
listing_resource_version = var.mp_listing_resource_version
2121

22-
os_version = var.instance_os_version == "Oracle-Linux-9" ? 9 : (var.instance_os_version == "Oracle-Linux-8" ? 8 : 7.9)
22+
#os_version = var.instance_os_version == "Oracle-Linux-9" ? 9 : (var.instance_os_version == "Oracle-Linux-8" ? 8 : 7.9)
2323

2424
instance_image_ocid = data.oci_core_images.oracle_linux.images[0].id
2525

‎OCIWorkVMStack/schema.yaml

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -127,8 +127,10 @@ variables:
127127
description: Oracle Linux image OCID for VM provisioning
128128
type: enum
129129
enum:
130-
- "Oracle-Linux-7"
131-
default: "Oracle-Linux-7"
130+
- "Oracle-Linux-7.9-2024.02.26-0"
131+
- "Oracle-Linux-8.9-2024.02.26-0"
132+
- "Oracle-Linux-9.3-2024.02.26-0"
133+
default: "Oracle-Linux-9.3-2024.02.26-0"
132134
#pattern: '^ocid1\.([a-z0-9_-]{1,32})\.([a-z0-9_-]{1,15})\.([a-z0-9]{0,24})\.([a-z0-9]{60})$'
133135
required: true
134136
instance_shape:
@@ -429,4 +431,4 @@ variables:
429431
mp_listing_resource_version:
430432
type: string
431433
tenancy_ocid:
432-
type: string
434+
type: string

‎cd3_automation_toolkit/Network/BaseNetwork/create_all_tf_objects.py

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,8 +25,10 @@ def create_all_tf_objects(inputfile, outdir, service_dir,prefix, ct, non_gf_tena
2525
os.makedirs(outdir)
2626
if len(service_dir) != 0:
2727
service_dir_network = service_dir['network']
28+
service_dir_seclist = service_dir['seclist']
2829
else:
2930
service_dir_network = ""
31+
service_dir_seclist = ""
3032
with section('Process VCNs Tab and DRGs Tab'):
3133
create_major_objects(inputfile, outdir, service_dir_network, prefix, ct, non_gf_tenancy, modify_network)
3234
create_terraform_defaults(inputfile, outdir, service_dir_network, prefix, ct, non_gf_tenancy, modify_network)
@@ -36,13 +38,14 @@ def create_all_tf_objects(inputfile, outdir, service_dir,prefix, ct, non_gf_tena
3638
with section('Process DRGs tab for DRG Route Tables and Route Distribution creation'):
3739
create_terraform_drg_route(inputfile, outdir, service_dir_network, prefix, ct, non_gf_tenancy, network_connectivity_in_setupoci, modify_network)
3840

41+
#Create Workflow
3942
if non_gf_tenancy == False:
4043
with section('Process Subnets tab for Routes creation'):
4144
create_terraform_route(inputfile, outdir, service_dir_network, prefix, ct, non_gf_tenancy, network_vlan_in_setupoci, modify_network)
42-
45+
# Create Workflow
4346
if non_gf_tenancy == False:
4447
with section('Process Subnets for Seclists creation'):
45-
create_terraform_seclist(inputfile, outdir, service_dir_network, prefix, ct, modify_network)
48+
create_terraform_seclist(inputfile, outdir, service_dir_seclist, prefix, ct, modify_network)
4649

4750
with section('Process Subnets for Subnets creation'):
4851
create_terraform_subnet_vlan(inputfile, outdir, service_dir, prefix, ct, non_gf_tenancy, network_vlan_in_setupoci,modify_network)

‎cd3_automation_toolkit/Network/BaseNetwork/export_network_nonGreenField.py

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1097,9 +1097,11 @@ def export_networking(inputfile, outdir, service_dir, config, signer, ct, export
10971097
if len(service_dir) != 0:
10981098
service_dir_network = service_dir['network']
10991099
service_dir_nsg = service_dir['nsg']
1100+
service_dir_seclist = service_dir['seclist']
11001101
else:
11011102
service_dir_network = ""
11021103
service_dir_nsg = ""
1104+
service_dir_seclist = ""
11031105

11041106
# Fetch Major Objects
11051107
export_major_objects(inputfile, outdir, service_dir_network, config=config, signer=signer, ct=ct, export_compartments=export_compartments, export_regions=export_regions)
@@ -1111,11 +1113,11 @@ def export_networking(inputfile, outdir, service_dir, config, signer, ct, export
11111113
export_subnets_vlans(inputfile, outdir, service_dir, config=config, signer=signer, ct=ct, export_compartments=export_compartments, export_regions=export_regions)
11121114

11131115
# Fetch RouteRules and SecRules
1114-
export_seclist(inputfile, outdir, service_dir_network, config=config, signer=signer, ct=ct, export_compartments=export_compartments, export_regions=export_regions,_tf_import_cmd=True)
1116+
export_seclist(inputfile, outdir, service_dir_seclist, config=config, signer=signer, ct=ct, export_compartments=export_compartments, export_regions=export_regions,_tf_import_cmd=True)
11151117

11161118
export_routetable(inputfile, outdir, service_dir_network, config1=config, signer1=signer, ct=ct, export_compartments=export_compartments, export_regions=export_regions, _tf_import_cmd=True)
11171119

11181120
export_drg_routetable(inputfile, outdir, service_dir_network, config1=config, signer1=signer, ct=ct, export_compartments=export_compartments, export_regions=export_regions, _tf_import_cmd=True)
11191121

11201122
# Fetch NSGs
1121-
export_nsg(inputfile, outdir, service_dir_nsg, config=config, signer=signer, ct=ct, export_compartments=export_compartments, export_regions=export_regions, _tf_import_cmd=True)
1123+
export_nsg(inputfile, outdir, service_dir_nsg, config=config, signer=signer, ct=ct, export_compartments=export_compartments, export_regions=export_regions, _tf_import_cmd=True)

‎cd3_automation_toolkit/Network/LoadBalancers/export_nlb_nonGreenField.py

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -128,7 +128,7 @@ def print_nlb_backendset_backendserver(region, ct, values_for_column_bss,NLBs, n
128128
elif col_header == "Backend Set Name":
129129
values_for_column_bss[col_header].append(backendsets)
130130
else:
131-
oci_objs = [eachnlb,backendset_details]
131+
oci_objs = [eachnlb,backendset_details,hc]
132132
values_for_column_bss = commonTools.export_extra_columns(oci_objs, col_header, sheet_dict_bss,values_for_column_bss)
133133

134134
return values_for_column_bss
@@ -145,7 +145,6 @@ def print_nlb_listener(region, outdir, values_for_column_lis, NLBs, nlb_compartm
145145
if 'ocid1.cluster' in created_by:
146146
continue
147147

148-
importCommands[reg] = open(outdir + "/" + reg + "/tf_import_commands_nlb_nonGF.sh", "a")
149148
nlb_display_name = eachnlb.display_name
150149
tf_name = commonTools.check_tf_variable(nlb_display_name)
151150
importCommands[reg].write("\nterraform import \"module.network-load-balancers[\\\"" + str(tf_name) + "\\\"].oci_network_load_balancer_network_load_balancer.network_load_balancer\" " + eachnlb.id)

‎cd3_automation_toolkit/Network/LoadBalancers/templates/backend-set-template

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,12 +29,16 @@ backend_sets = {
2929
interval_ms = "{{ interval_in_millis }}"
3030
{% endif %}
3131

32+
{% if response_body_regex and response_body_regex != '' %}
33+
response_body_regex = "{{ response_body_regex }}"
34+
{% endif %}
35+
3236
{% if port != '' %}
3337
port = "{{ backend_healthcheck_port }}"
3438
{% endif %}
3539

36-
{% if response_body_regex and response_body_regex != '' %}
37-
response_body_regex = "{{ response_body_regex }}"
40+
{% if is_force_plain_text and is_force_plain_text != '' %}
41+
is_force_plain_text = {{ is_force_plain_text }}
3842
{% endif %}
3943

4044
{% if retries and retries != '' %}

‎cd3_automation_toolkit/Network/LoadBalancers/templates/nlb-backend-set-template

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -54,14 +54,11 @@ nlb_backend_sets = {
5454

5555
{% if request_data and request_data != '' %}
5656
request_data = "{{ request_data }}"
57-
{% else %}
58-
request_data = null
5957
{% endif %}
6058

59+
6160
{% if response_data and response_data != '' %}
6261
response_data = "{{ response_data }}"
63-
{% else %}
64-
response_data = null
6562
{% endif %}
6663

6764
{% if timeout_in_millis and timeout_in_millis != '' %}

0 commit comments

Comments
 (0)