File tree Expand file tree Collapse file tree 3 files changed +2
-10
lines changed
jobs/e2e_node/crio/templates Expand file tree Collapse file tree 3 files changed +2
-10
lines changed Original file line number Diff line number Diff line change 2
2
storage :
3
3
files :
4
4
- path : /etc/crio/crio.conf.d/99-crun.conf
5
- # Note: This also assumes the crun handler is enabled in the base crio.conf,
6
- # crun is installed, and the version of crun supports the `crun features` command.
7
- # All of this is true at the time of writing.
8
- # TODO(haircommander): This can be removed when runc 1.2.0 is released
9
5
contents :
10
6
local : 99-crun.conf
11
7
mode : 0644
Original file line number Diff line number Diff line change @@ -47,10 +47,6 @@ storage:
47
47
mode : 0644
48
48
overwrite : true
49
49
- path : /etc/crio/crio.conf.d/99-crun.conf
50
- # Note: This also assumes the crun handler is enabled in the base crio.conf,
51
- # crun is installed, and the version of crun supports the `crun features` command.
52
- # All of this is true at the time of writing.
53
- # TODO(haircommander): This can be removed when runc 1.2.0 is released
54
50
contents :
55
51
local : 99-crun.conf
56
52
mode : 0644
Original file line number Diff line number Diff line change 84
84
CRIO_SCRIPT_COMMIT=$( grep " CRIO_SCRIPT_COMMIT" " $BASE_PATH /env.yaml" | sed -rn ' s/^.*CRIO_SCRIPT_COMMIT=([0-9a-f]+).*$/\1/p' )
85
85
CRIO_SCRIPT_URL=" https://raw.githubusercontent.com/cri-o/packaging/$CRIO_SCRIPT_COMMIT /get"
86
86
curl -fs " $CRIO_SCRIPT_URL " -o /dev/null || {
87
- echo " Error: CRIO_SCRIPT_COMMIT in $BASE_PATH /env.yaml is wrong. The get script was not found at: $CRIO_SCRIPT_URL " 1>&2
88
- exit 1
87
+ echo " Error: CRIO_SCRIPT_COMMIT in $BASE_PATH /env.yaml is wrong. The get script was not found at: $CRIO_SCRIPT_URL " 1>&2
88
+ exit 1
89
89
}
90
90
91
91
CRIO_COMMIT=$( grep " CRIO_COMMIT" " $BASE_PATH /env.yaml" | sed -rn ' s/^.*CRIO_COMMIT=([0-9a-f]+).*$/\1/p' )
You can’t perform that action at this time.
0 commit comments