Skip to content

Commit b095d04

Browse files
sashwin04NandiniA8naxwu2intel
authored
External release 25.27.1_ext (#115)
* External release 25.27.1_ext * Update conda-requirements.txt * Update go.mod * Update conda-requirements.txt * Update requirements.txt --------- Co-authored-by: NandiniA8na <nandini.a@intel.com> Co-authored-by: Xintian Wu <75466671+xwu2intel@users.noreply.github.com>
1 parent 6b78a7b commit b095d04

File tree

55 files changed

+1141
-62
lines changed

Some content is hidden

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

55 files changed

+1141
-62
lines changed

script/terraform/Dockerfile.1.alicloud

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,12 +13,12 @@ ARG OS_IMAGE=ubuntu
1313
FROM ${OS_IMAGE}:${OS_VER} as provider
1414
RUN apt-get update && apt-get install -y git curl make zip
1515

16-
ARG GO_VER=1.24.1
16+
ARG GO_VER=1.25.1
1717
ARG GO_PKG=https://go.dev/dl/go${GO_VER}.linux-amd64.tar.gz
1818
RUN curl --netrc-optional --retry 10 --retry-connrefused -fsSL ${GO_PKG} | tar xfz - -C /usr/local
1919
COPY script/cpuoptions.patch /
2020

21-
ARG ALICLOUD_PROVIDER_VER=1.244.0
21+
ARG ALICLOUD_PROVIDER_VER=1.260.0
2222
ARG ALICLOUD_PROVIDER_REPO=https://github.com/aliyun/terraform-provider-alicloud
2323
RUN git clone ${ALICLOUD_PROVIDER_REPO} && \
2424
cd terraform-provider-alicloud && \
@@ -33,7 +33,7 @@ RUN cd terraform-provider-alicloud/bin && \
3333

3434
FROM terraform-csp-base${RELEASE}
3535

36-
ARG ALIYUN_CLI_VER=3.0.264
36+
ARG ALIYUN_CLI_VER=3.0.304
3737
ARG ALIYUN_CLI_PACKAGE=https://github.com/aliyun/aliyun-cli/releases/download/v${ALIYUN_CLI_VER}/aliyun-cli-linux-${ALIYUN_CLI_VER}-amd64.tgz
3838
RUN curl --netrc-optional --retry 10 --retry-connrefused -fsSL ${ALIYUN_CLI_PACKAGE} | tar -xz -C /usr/local/bin
3939

script/terraform/Dockerfile.2.static-ext

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,6 @@ ARG RELEASE
99
FROM terraform-base${RELEASE}
1010

1111
# Pre-install perfspect
12-
ARG PERFSPECT_VER=3.6.1
12+
ARG PERFSPECT_VER=3.9.1
1313
ARG PERFSPECT_PKG=https://github.com/intel/PerfSpect/releases/download/v${PERFSPECT_VER}/perfspect.tgz
1414
RUN curl --netrc-optional --retry 10 --retry-connrefused -fsSL -o /tmp/perfspect-${PERFSPECT_VER}.tgz ${PERFSPECT_PKG}

script/terraform/Dockerfile.3.terraform

Lines changed: 2 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ RUN git clone ${FLAMEGRAPH_REPO} flamegraph && \
2525
FROM ${OS_IMAGE}:${OS_VER} as go-dev
2626
RUN apt-get update && apt-get install -y git curl make gcc pkg-config libdevmapper-dev libgpgme-dev
2727

28-
ARG GO_VER=1.24.1
28+
ARG GO_VER=1.25.1
2929
ARG GO_PKG=https://go.dev/dl/go${GO_VER}.linux-amd64.tar.gz
3030
ENV GOPATH=/home/go
3131
RUN curl --netrc-optional --retry 10 --retry-connrefused -fsSL ${GO_PKG} | tar xfz - -C /usr/local && \
@@ -34,7 +34,7 @@ ENV PATH=/usr/local/go/bin:$PATH
3434

3535
FROM go-dev as goshu
3636

37-
ARG GOSU_VER=1.17
37+
ARG GOSU_VER=1.18
3838
ARG GOSU_REPO=https://github.com/tianon/gosu
3939
RUN git clone ${GOSU_REPO} && \
4040
cd gosu && \
@@ -68,17 +68,6 @@ RUN mkdir -p $GOPATH/src/github.com/containers && \
6868
DISABLE_DOCS=1 make bin/skopeo && \
6969
DISABLE_DOCS=1 make install
7070

71-
FROM ${OS_IMAGE}:${OS_VER} as kubectl
72-
RUN apt-get update && apt-get install -y curl gnupg
73-
74-
ARG KUBECTL_VER=1.30
75-
ARG KUBECTL_REPO=https://pkgs.k8s.io/core:/stable:/v${KUBECTL_VER}/deb
76-
RUN mkdir -p /etc/apt/keyrings && \
77-
curl --netrc-optional --retry 10 --retry-connrefused -fsSL ${KUBECTL_REPO}/Release.key | gpg --dearmor -o /etc/apt/keyrings/kubernetes-apt-keyring.gpg && \
78-
echo "deb [signed-by=/etc/apt/keyrings/kubernetes-apt-keyring.gpg] ${KUBECTL_REPO}/ /" > /etc/apt/sources.list.d/kubernetes.list && \
79-
apt-get update && \
80-
apt-get install -y kubectl=${KUBECTL_VER}*
81-
8271
FROM ${OS_IMAGE}:${OS_VER}
8372
ENV DEBIAN_FRONTEND=noninteractive
8473
RUN apt-get update && apt-get install -y --no-install-recommends libdevmapper1.02.1 libgpgme11t64 sshpass zip unzip less gnupg ca-certificates curl gawk netcat-openbsd netcat-traditional ncat connect-proxy sudo openssh-client bzip2 jq git && \
@@ -109,9 +98,6 @@ COPY --from=packer /home/go/bin/packer /usr/local/bin/
10998
COPY --from=dockercli /usr/local/bin/docker /usr/local/bin/
11099
COPY --from=dockercli /usr/local/libexec/docker/cli-plugins/docker-compose /usr/local/libexec/docker/cli-plugins/
111100

112-
# Install kubectl
113-
COPY --from=kubectl /usr/bin/kubectl /usr/local/bin/
114-
115101
# Copy FlameGraph utilities
116102
COPY --from=flamegraph /flamegraph/stackcollapse-perf.pl /usr/local/bin/
117103
COPY --from=flamegraph /flamegraph/flamegraph.pl /usr/local/bin/

script/terraform/template/ansible/common/roles/sutinfo/defaults/main/perfspect.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,6 @@
44
# SPDX-License-Identifier: Apache-2.0
55
#
66

7-
perfspect_version: "3.6.1"
8-
perfspect_report_options: ''
7+
perfspect_version: "3.9.1"
8+
perfspect_report_options: '--noupdate'
99

script/terraform/template/ansible/common/roles/sutinfo/tasks/perfspect-win.yaml

Lines changed: 96 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -21,16 +21,107 @@
2121

2222
- name: get memory information
2323
win_shell: |
24-
Get-WmiObject Win32_PhysicalMemory
24+
Get-WmiObject Win32_PhysicalMemory |ConvertTo-Json -Depth 3
2525
register: meminfo
2626

27+
- name: Set Memory Channel info from meminfo
28+
set_fact:
29+
memchannelinfo: "{{ (meminfo.stdout | from_json | map(attribute='BankLabel') | select('defined') | map('regex_replace', '(DIMM.*)', '') | list | unique | length) }}"
30+
31+
- name: Get CPU information
32+
win_shell: |
33+
Get-CimInstance Win32_Processor | Select-Object DeviceID, Name, Caption, NumberOfCores, NumberOfLogicalProcessors, MaxClockSpeed, Architecture, L2CacheSize, L3CacheSize, @{Name="NUMANode";Expression={(Get-CimInstance Win32_Processor | Select-Object -ExpandProperty DeviceID)}} | ConvertTo-Json
34+
register: cpuinfo
35+
36+
- name: Get Disk Information
37+
win_shell: |
38+
Get-PhysicalDisk | ConvertTo-Json
39+
register: diskinfo
40+
41+
- name: Get Chassis Information
42+
win_shell: |
43+
Get-WmiObject -Class Win32_SystemEnclosure | Select-Object ChassisTypes, Status, LockPresent, SecurityStatus, Manufacturer, Model, SerialNumber | ConvertTo-Json
44+
register: chassisinfo
45+
46+
- name: Get GPU information
47+
win_shell: |
48+
Get-WmiObject -Class Win32_VideoController | ConvertTo-Json
49+
register: gpuinfo
50+
51+
- name: Get PCIe device information
52+
win_shell: |
53+
Get-WmiObject Win32_PnPEntity | Where-Object { $_.PNPDeviceID -like "PCI*" } |
54+
Select-Object Name, @{Name='BusAddress'; Expression={$_.PNPDeviceID}}, Manufacturer, PNPClass, Present, Status, Service |
55+
ConvertTo-Json
56+
register: pcieinfo
57+
58+
- name: Get acclerators information
59+
win_shell: |
60+
Get-PnpDevice | Where-Object {
61+
($_.FriendlyName -match 'DLB|DSA|IAA|QAT|GNA|AI Boost|VPU|vRAN|AMX|FPGA|PAC|Arria|Stratix|NPU|TPU|AI Engine|Deep Learning|Inference|ML Accelerator|Edge TPU|GPU|Graphics|Video Controller|Compute Adapter|CUDA|Tensor|T4|A100|H100|RTX|Quadro|Tesla|Crypto|Compression|NVMe|Storage Accelerator|DPU|SmartNIC|Coprocessor|Accelerator|AI|Gaudi') -and
62+
($_.Class -ne "HIDClass")} | Select-Object Status, Class, @{Name='Name'; Expression={$_.FriendlyName}}, Manufacturer, Service, Present, Problem | ConvertTo-Json
63+
register: acceleratorsinfo
64+
65+
- name: Get Sensor Information
66+
win_shell: |
67+
Get-CimInstance -Namespace root/wmi -ClassName MSAcpi_ThermalZoneTemperature | Select-Object InstanceName, @{Name="CurrentTemperatureCelsius"; Expression={($_.CurrentTemperature - 2732) / 10}}, Active | ConvertTo-Json
68+
register: sensorinfo
69+
ignore_errors: true
70+
71+
- name: Get Running Microcode Version
72+
win_shell: |
73+
$RegPath = "HKLM:\HARDWARE\DESCRIPTION\System\CentralProcessor\0"
74+
$UpdateRevision = (Get-ItemProperty -Path $RegPath -Name "Update Revision")."Update Revision"
75+
$RunningMicrocode = $UpdateRevision[0..4] -join ''
76+
$MicrocodeHex = [String]::Format("{0:x2}", [int]($RunningMicrocode.ToString()).TrimStart('0'))
77+
$MicrocodeHex.ToUpper()
78+
register: microcodeinfo
79+
80+
- name: Get Network Interfaces
81+
win_shell: |
82+
Get-NetAdapter | Select-Object Name, Status, MacAddress, LinkSpeed, MediaType, InterfaceDescription | ConvertTo-Json
83+
register: netinfo
84+
85+
- name: Get Base Board Information
86+
win_shell: |
87+
Get-WmiObject -Class Win32_BaseBoard | Select-Object Manufacturer, Product, SerialNumber, Version, PoweredOn | ConvertTo-Json
88+
register: baseboardinfo
89+
90+
- name: Get System Information
91+
win_shell: |
92+
Get-WmiObject -Class Win32_ComputerSystem | Select-Object Manufacturer, Model, Name, SystemType, TotalPhysicalMemory, NumberOfProcessors, NumberOfLogicalProcessors, Domain, Workgroup, BootupState | ConvertTo-Json
93+
register: systeminfo
94+
95+
2796
- name: Generate svrinfo json
2897
template:
29-
src: perfspect.json.j2
98+
src: perfspect-win.json.j2
3099
dest: "{{ wl_logs_dir }}/{{ inventory_hostname }}-sutinfo/{{ private_ip | default(ansible_host) }}.json"
31100
delegate_to: localhost
32101
ignore_errors: true
33102
vars:
34-
mem_spec: "{% for c in (meminfo.stdout_lines | select('match','^Capacity *:.*') | map('split',':') | map('last') | map('trim') | map('int')) %}{{ (c / (1024*1024)) | int }}MB {% endfor %}"
35-
mem_spec_list: "{{ mem_spec | split(' ') | reject('==','') }}"
36-
103+
numainfo: "{{ numainfo }}"
104+
memInfo: "{{ meminfo.stdout | from_json }}"
105+
ansible_devices: "{{ hostvars[inventory_hostname].ansible_devices | default({}) }}"
106+
ansible_mounts: "{{ hostvars[inventory_hostname].ansible_mounts | default([]) }}"
107+
ansible_interfaces: "{{ hostvars[inventory_hostname].ansible_interfaces | default([]) }}"
108+
cpuInfo: "{{ (cpuinfo.stdout | from_json) if (cpuinfo.stdout is defined and cpuinfo.stdout | length > 0) else [] }}"
109+
memChannelCount: "{{ memchannelinfo | int }}"
110+
disks: "{{ (diskinfo.stdout | from_json) if (diskinfo.stdout is defined and diskinfo.stdout | length > 0) else [] }}"
111+
chassis: "{{ (chassisinfo.stdout | from_json) if (chassisinfo.stdout is defined and chassisinfo.stdout | length > 0) else [] }}"
112+
gpus: "{{ (gpuinfo.stdout | from_json) if (gpuinfo.stdout is defined and gpuinfo.stdout | length > 0) else [] }}"
113+
pcie_devices: "{{ (pcieinfo.stdout | from_json) if (pcieinfo.stdout is defined and pcieinfo.stdout | length > 0) else [] }}"
114+
accelerators: "{{ (acceleratorsinfo.stdout | from_json) if (acceleratorsinfo.stdout is defined and acceleratorsinfo.stdout | length > 0) else [] }}"
115+
microcode: "{{ microcodeinfo.stdout}}"
116+
nicInfo: "{{ (netinfo.stdout | from_json) if (netinfo.stdout is defined and netinfo.stdout | length > 0) else [] }}"
117+
baseboard: "{{ (baseboardinfo.stdout | from_json) if (baseboardinfo.stdout is defined and baseboardinfo.stdout | length > 0) else {} }}"
118+
system: "{{ (systeminfo.stdout | from_json) if (systeminfo.stdout is defined and systeminfo.stdout | length > 0) else {} }}"
119+
sensors: "{{ (sensorinfo.stdout | from_json) if (sensorinfo.stdout is defined and sensorinfo.stdout | length > 0) else [] }}"
120+
kernellogs: "{{ (kernellogsinfo.stdout | from_json) if (kernellogsinfo.stdout is defined and kernellogsinfo.stdout | length > 0) else [] }}"
121+
memTypeMap:
122+
20: 'DDR'
123+
21: 'DDR2'
124+
24: 'DDR3'
125+
26: 'DDR4'
126+
34: 'DDR5'
127+
0: 'Unknown'

script/terraform/template/ansible/common/roles/sutinfo/tasks/perfspect.yaml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -31,9 +31,9 @@
3131
- name: Uncompress the perfspect package
3232
unarchive:
3333
src: "/tmp/perfspect-{{ perfspect_version }}.tgz"
34-
dest: /tmp/
35-
remote_src: true
36-
delegate_to: localhost
34+
dest: "/tmp/"
35+
remote_src: "{{ ((ansible_connection|default('.ssh')) == 'self') | ternary(false,true) }}"
36+
delegate_to: "{{ ((ansible_connection|default('.ssh')) == 'self') | ternary(omit,'localhost') }}"
3737
run_once: true
3838
become: false
3939

@@ -50,6 +50,6 @@
5050
until: perfspect_rc is success
5151
retries: 2
5252
delay: 10
53-
delegate_to: localhost
53+
delegate_to: "{{ ((ansible_connection|default('.ssh')) == 'self') | ternary(omit,'localhost') }}"
5454
ignore_errors: yes
5555

0 commit comments

Comments
 (0)