Skip to content

Commit dd172d5

Browse files
narekhovhannisyannarekhovhannisyan
authored
Merge pull request #1036 from Green-Software-Foundation/fix-manifests
Fix output manifests to run with if-check
2 parents 5982794 + d0894b6 commit dd172d5

18 files changed

+449
-268
lines changed

‎.gitmodules

Lines changed: 0 additions & 3 deletions
This file was deleted.

‎manifests/examples/builtins/time-sync/failure-missing-global-config.yml renamed to ‎manifests/examples/builtins/time-sync/failure-missing-config.yml

Lines changed: 6 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -5,30 +5,25 @@ initialize:
55
output:
66
- yaml
77
plugins:
8-
"time-sync":
8+
'time-sync':
99
method: TimeSync
10-
path: "builtin"
11-
config:
12-
# start-time: '2023-12-12T00:00:00.000Z'
13-
# end-time: '2023-12-12T00:01:00.000Z'
14-
# interval: 5
15-
# allow-padding: true
10+
path: 'builtin'
1611
tree:
1712
children:
1813
child:
1914
pipeline:
2015
compute:
2116
- time-sync
2217
inputs:
23-
- timestamp: "2023-12-12T00:00:00.000Z"
18+
- timestamp: '2023-12-12T00:00:00.000Z'
2419
duration: 3
2520
energy-cpu: 0.001
26-
- timestamp: "2023-12-12T00:00:01.000Z"
21+
- timestamp: '2023-12-12T00:00:01.000Z'
2722
duration: 5
2823
energy-cpu: 0.001
29-
- timestamp: "2023-12-12T00:00:06.000Z"
24+
- timestamp: '2023-12-12T00:00:06.000Z'
3025
duration: 7
3126
energy-cpu: 0.001
32-
- timestamp: "2023-12-12T00:00:13.000Z"
27+
- timestamp: '2023-12-12T00:00:13.000Z'
3328
duration: 30
3429
energy-cpu: 0.001

‎manifests/examples/builtins/time-sync/success.yml

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -5,12 +5,12 @@ initialize:
55
output:
66
- yaml
77
plugins:
8-
"time-sync":
8+
'time-sync':
99
method: TimeSync
10-
path: "builtin"
10+
path: 'builtin'
1111
config:
12-
start-time: "2023-12-12T00:00:00.000Z"
13-
end-time: "2023-12-12T00:01:00.000Z"
12+
start-time: '2023-12-12T00:00:00.000Z'
13+
end-time: '2023-12-12T00:01:00.000Z'
1414
interval: 5
1515
allow-padding: true
1616
tree:
@@ -20,15 +20,15 @@ tree:
2020
compute:
2121
- time-sync
2222
inputs:
23-
- timestamp: "2023-12-12T00:00:00.000Z"
23+
- timestamp: '2023-12-12T00:00:00.000Z'
2424
duration: 1
2525
energy-cpu: 0.001
26-
- timestamp: "2023-12-12T00:00:01.000Z"
26+
- timestamp: '2023-12-12T00:00:01.000Z'
2727
duration: 5
2828
energy-cpu: 0.001
29-
- timestamp: "2023-12-12T00:00:06.000Z"
29+
- timestamp: '2023-12-12T00:00:06.000Z'
3030
duration: 7
3131
energy-cpu: 0.001
32-
- timestamp: "2023-12-12T00:00:13.000Z"
32+
- timestamp: '2023-12-12T00:00:13.000Z'
3333
duration: 30
3434
energy-cpu: 0.001

‎manifests/outputs/bugs/aggregation-error-wrong-metric.yaml

Lines changed: 31 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ initialize:
1919
- 10
2020
- 50
2121
- 100
22-
"y":
22+
'y':
2323
- 0.12
2424
- 0.32
2525
- 0.75
@@ -83,34 +83,33 @@ initialize:
8383
method: TimeSync
8484
path: builtin
8585
config:
86-
start-time: "2023-12-12T00:00:00.000Z"
87-
end-time: "2023-12-12T00:01:00.000Z"
86+
start-time: '2023-12-12T00:00:00.000Z'
87+
end-time: '2023-12-12T00:01:00.000Z'
8888
interval: 5
8989
allow-padding: true
9090
execution:
9191
status: fail
9292
command: >-
93-
/Users/mariamkhalatova/.npm/_npx/1bf7c3c15bf47d04/node_modules/.bin/ts-node
94-
/Users/mariamkhalatova/Projects/UK/if/src/index.ts -m
95-
manifests/outputs/bugs/aggregation-error-wrong-metric.yml -o
96-
manifests/outputs/bugs/aggregation-error-wrong-metric
93+
/Users/manushak/.npm/_npx/1bf7c3c15bf47d04/node_modules/.bin/ts-node
94+
/Users/manushak/Documents/Projects/Green-Software/if/src/if-run/index.ts -m
95+
manifests/outputs/bugs/aggregation-error-wrong-metric.yaml
9796
environment:
98-
if-version: 0.4.0
97+
if-version: 0.6.0
9998
os: macOS
100-
os-version: "13.2"
101-
node-version: 18.14.2
102-
date-time: 2024-07-01T19:25:34.759Z (UTC)
99+
os-version: 14.6.1
100+
node-version: 18.20.4
101+
date-time: 2024-10-04T08:38:25.343Z (UTC)
103102
dependencies:
104-
- "@babel/core@7.22.10"
105-
- "@babel/preset-typescript@7.23.3"
106-
- "@commitlint/cli@18.6.0"
107-
- "@commitlint/config-conventional@18.6.0"
108-
- "@grnsft/if-core@0.0.10"
109-
- "@jest/globals@29.7.0"
110-
- "@types/jest@29.5.8"
111-
- "@types/js-yaml@4.0.9"
112-
- "@types/luxon@3.4.2"
113-
- "@types/node@20.9.0"
103+
- '@babel/core@7.22.10'
104+
- '@babel/preset-typescript@7.23.3'
105+
- '@commitlint/cli@18.6.0'
106+
- '@commitlint/config-conventional@18.6.0'
107+
- '@grnsft/if-core@0.0.25'
108+
- '@jest/globals@29.7.0'
109+
- '@types/jest@29.5.8'
110+
- '@types/js-yaml@4.0.9'
111+
- '@types/luxon@3.4.2'
112+
- '@types/node@20.9.0'
114113
- axios-mock-adapter@1.22.0
115114
- axios@1.7.2
116115
- cross-env@7.0.3
@@ -130,9 +129,10 @@ execution:
130129
- typescript-cubic-spline@1.0.1
131130
- typescript@5.2.2
132131
- winston@3.11.0
133-
- zod@3.22.4
132+
- zod@3.23.8
134133
error: >-
135-
MissingInputDataError: `functional-unit` value is missing from input data or it is not a positive integer
134+
MissingAggregationParamError: Aggregation metric dummy-param is not found in
135+
inputs[0].
136136
tree:
137137
children:
138138
child-1:
@@ -160,25 +160,25 @@ tree:
160160
vcpus-allocated: 1
161161
vcpus-total: 8
162162
inputs:
163-
- timestamp: "2023-12-12T00:00:00.000Z"
163+
- timestamp: '2023-12-12T00:00:00.000Z'
164164
cloud/instance-type: A1
165165
cloud/region: uk-west
166166
duration: 1
167167
cpu/utilization: 10
168168
requests: 100
169-
- timestamp: "2023-12-12T00:00:01.000Z"
169+
- timestamp: '2023-12-12T00:00:01.000Z'
170170
duration: 5
171171
cpu/utilization: 20
172172
cloud/instance-type: A1
173173
cloud/region: uk-west
174174
requests: 100
175-
- timestamp: "2023-12-12T00:00:06.000Z"
175+
- timestamp: '2023-12-12T00:00:06.000Z'
176176
duration: 7
177177
cpu/utilization: 15
178178
cloud/instance-type: A1
179179
cloud/region: uk-west
180180
requests: 100
181-
- timestamp: "2023-12-12T00:00:13.000Z"
181+
- timestamp: '2023-12-12T00:00:13.000Z'
182182
duration: 30
183183
cloud/instance-type: A1
184184
cloud/region: uk-west
@@ -209,25 +209,25 @@ tree:
209209
vcpus-allocated: 1
210210
vcpus-total: 8
211211
inputs:
212-
- timestamp: "2023-12-12T00:00:00.000Z"
212+
- timestamp: '2023-12-12T00:00:00.000Z'
213213
duration: 1
214214
cpu/utilization: 30
215215
cloud/instance-type: A1
216216
cloud/region: uk-west
217217
requests: 100
218-
- timestamp: "2023-12-12T00:00:01.000Z"
218+
- timestamp: '2023-12-12T00:00:01.000Z'
219219
duration: 5
220220
cpu/utilization: 28
221221
cloud/instance-type: A1
222222
cloud/region: uk-west
223223
requests: 100
224-
- timestamp: "2023-12-12T00:00:06.000Z"
224+
- timestamp: '2023-12-12T00:00:06.000Z'
225225
duration: 7
226226
cpu/utilization: 40
227227
cloud/instance-type: A1
228228
cloud/region: uk-west
229229
requests: 100
230-
- timestamp: "2023-12-12T00:00:13.000Z"
230+
- timestamp: '2023-12-12T00:00:13.000Z'
231231
duration: 30
232232
cpu/utilization: 33
233233
cloud/instance-type: A1

‎manifests/outputs/bugs/sci-embodied-missing-resources-total.yaml

Lines changed: 0 additions & 72 deletions
This file was deleted.

‎manifests/outputs/builtins/sci-embodied/failure-invalid-default-emission-value.yaml

Lines changed: 22 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
name: sci-embodied
22
description: >-
3-
failure with `defaults.device/emissions-embodied` being string instead of
4-
number
3+
failure with `vCPUs` being string instead of number
54
tags: null
65
initialize:
76
plugins:
@@ -11,28 +10,26 @@ initialize:
1110
execution:
1211
status: fail
1312
command: >-
14-
/Users/mariamkhalatova/.npm/_npx/1bf7c3c15bf47d04/node_modules/.bin/ts-node
15-
/Users/mariamkhalatova/Projects/UK/if/src/index.ts -m
16-
manifests/outputs/plugins/sci-embodied/failure-invalid-default-emission-value.yml
17-
-o
18-
manifests/outputs/plugins/sci-embodied/failure-invalid-default-emission-value
13+
/Users/manushak/.npm/_npx/1bf7c3c15bf47d04/node_modules/.bin/ts-node
14+
/Users/manushak/Documents/Projects/Green-Software/if/src/if-run/index.ts -m
15+
manifests/outputs/builtins/sci-embodied/failure-invalid-default-emission-value.yaml
1916
environment:
20-
if-version: 0.4.0
17+
if-version: 0.6.0
2118
os: macOS
22-
os-version: "13.2"
23-
node-version: 18.14.2
24-
date-time: 2024-07-02T20:49:08.280Z (UTC)
19+
os-version: 14.6.1
20+
node-version: 18.20.4
21+
date-time: 2024-10-04T08:59:52.608Z (UTC)
2522
dependencies:
26-
- "@babel/core@7.22.10"
27-
- "@babel/preset-typescript@7.23.3"
28-
- "@commitlint/cli@18.6.0"
29-
- "@commitlint/config-conventional@18.6.0"
30-
- "@grnsft/if-core@0.0.10"
31-
- "@jest/globals@29.7.0"
32-
- "@types/jest@29.5.8"
33-
- "@types/js-yaml@4.0.9"
34-
- "@types/luxon@3.4.2"
35-
- "@types/node@20.9.0"
23+
- '@babel/core@7.22.10'
24+
- '@babel/preset-typescript@7.23.3'
25+
- '@commitlint/cli@18.6.0'
26+
- '@commitlint/config-conventional@18.6.0'
27+
- '@grnsft/if-core@0.0.25'
28+
- '@jest/globals@29.7.0'
29+
- '@types/jest@29.5.8'
30+
- '@types/js-yaml@4.0.9'
31+
- '@types/luxon@3.4.2'
32+
- '@types/node@20.9.0'
3633
- axios-mock-adapter@1.22.0
3734
- axios@1.7.2
3835
- cross-env@7.0.3
@@ -52,20 +49,19 @@ execution:
5249
- typescript-cubic-spline@1.0.1
5350
- typescript@5.2.2
5451
- winston@3.11.0
55-
- zod@3.22.4
52+
- zod@3.23.8
5653
error: >-
57-
InputValidationError: "device/emissions-embodied" parameter is invalid
58-
number. please provide it as `gco2e` to input. Error code: invalid_union.
54+
InputValidationError: "vCPUs" parameter is expected number, received string
55+
at index 0. Error code: invalid_type.
5956
tree:
6057
children:
6158
child:
6259
pipeline:
6360
compute:
6461
- sci-embodied
6562
defaults:
66-
device/emissions-embodied: fail
63+
vCPUs: fail
6764
time-reserved: 3600
68-
device/expected-lifespan: 94608000
6965
resources-reserved: 1
7066
resources-total: 8
7167
inputs:

0 commit comments

Comments
 (0)