Skip to content

Commit b8e0743

Browse files
runcomsdodson
runcom
authored and
sdodson
committed
CRI-O: match version against openshift
Signed-off-by: Antonio Murdaca <[email protected]>
1 parent 14be97d commit b8e0743

4 files changed

+138
-14
lines changed

‎sjb/config/test_cases/test_branch_origin_extended_conformance_crio.yml

Lines changed: 33 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -93,14 +93,29 @@ extensions:
9393
title: "origin prerequisites"
9494
repository: "aos-cd-jobs"
9595
script: |-
96+
crio_tag="$( cat ./ORIGIN_PKG_VERSION | grep -Po '\d.\d' )"
97+
case $crio_tag in
98+
"3.7")
99+
crio_image="docker.io/runcom/cri-o-system-container:v3.7"
100+
;;
101+
"3.8")
102+
crio_image="docker.io/runcom/cri-o-system-container:v3.8"
103+
;;
104+
"3.9")
105+
crio_image="docker.io/runcom/cri-o-system-container:v3.9"
106+
;;
107+
""|*)
108+
crio_image="docker.io/runcom/cri-o-system-container:latest"
109+
;;
110+
esac
96111
local_ip="$( curl http://169.254.169.254/latest/meta-data/local-ipv4 )"
97112
ansible-playbook -vv --become \
98113
--become-user root \
99114
--connection local \
100115
--inventory sjb/inventory/ \
101116
-e deployment_type=origin \
102117
-e openshift_use_crio=True \
103-
-e openshift_crio_systemcontainer_image_override=docker.io/gscrivano/cri-o-centos \
118+
-e openshift_crio_systemcontainer_image_override="${crio_image}" \
104119
-e etcd_data_dir="${ETCD_DATA_DIR}" \
105120
-e openshift_master_default_subdomain="${local_ip}.nip.io" \
106121
-e openshift_pkg_version="$( cat ./ORIGIN_PKG_VERSION )" \
@@ -119,6 +134,21 @@ extensions:
119134
else
120135
playbook="${playbook_base}byo/openshift-node/network_manager.yml"
121136
fi
137+
crio_tag="$( cat ./ORIGIN_PKG_VERSION | grep -Po '\d.\d' )"
138+
case $crio_tag in
139+
"3.7")
140+
crio_image="docker.io/runcom/cri-o-system-container:v3.7"
141+
;;
142+
"3.8")
143+
crio_image="docker.io/runcom/cri-o-system-container:v3.8"
144+
;;
145+
"3.9")
146+
crio_image="docker.io/runcom/cri-o-system-container:v3.9"
147+
;;
148+
""|*)
149+
crio_image="docker.io/runcom/cri-o-system-container:latest"
150+
;;
151+
esac
122152
local_ip="$( curl http://169.254.169.254/latest/meta-data/local-ipv4 )"
123153
ansible-playbook -vv --become \
124154
--become-user root \
@@ -137,7 +167,7 @@ extensions:
137167
--inventory sjb/inventory/ \
138168
-e deployment_type=origin \
139169
-e openshift_use_crio=True \
140-
-e openshift_crio_systemcontainer_image_override=docker.io/gscrivano/cri-o-centos \
170+
-e openshift_crio_systemcontainer_image_override="${crio_image}" \
141171
-e etcd_data_dir="${ETCD_DATA_DIR}" \
142172
-e openshift_master_default_subdomain="${local_ip}.nip.io" \
143173
-e openshift_pkg_version="$( cat ./ORIGIN_PKG_VERSION )" \
@@ -169,6 +199,7 @@ extensions:
169199
- /etc/crio
170200
- /etc/systemd/system
171201
generated_artifacts:
202+
crio.commit: "sudo runc exec -t cri-o crio --version"
172203
dmesg.log: "dmesg"
173204
journal_xe.log: "sudo journalctl -xe"
174205
avc_selinux_denials.log: 'sudo ausearch -m avc -ts recent'

‎sjb/generated/test_branch_origin_extended_conformance_crio.xml

Lines changed: 35 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -529,14 +529,29 @@ cat &lt;&lt;SCRIPT &gt;&#34;${script}&#34;
529529
#!/bin/bash
530530
set -o errexit -o nounset -o pipefail -o xtrace
531531
cd &#34;\${GOPATH}/src/github.com/openshift/aos-cd-jobs&#34;
532+
crio_tag=&#34;\$( cat ./ORIGIN_PKG_VERSION | grep -Po &#39;\d.\d&#39; )&#34;
533+
case \$crio_tag in
534+
&#34;3.7&#34;)
535+
crio_image=&#34;docker.io/runcom/cri-o-system-container:v3.7&#34;
536+
;;
537+
&#34;3.8&#34;)
538+
crio_image=&#34;docker.io/runcom/cri-o-system-container:v3.8&#34;
539+
;;
540+
&#34;3.9&#34;)
541+
crio_image=&#34;docker.io/runcom/cri-o-system-container:v3.9&#34;
542+
;;
543+
&#34;&#34;|*)
544+
crio_image=&#34;docker.io/runcom/cri-o-system-container:latest&#34;
545+
;;
546+
esac
532547
local_ip=&#34;\$( curl http://169.254.169.254/latest/meta-data/local-ipv4 )&#34;
533548
ansible-playbook -vv --become \
534549
--become-user root \
535550
--connection local \
536551
--inventory sjb/inventory/ \
537552
-e deployment_type=origin \
538553
-e openshift_use_crio=True \
539-
-e openshift_crio_systemcontainer_image_override=docker.io/gscrivano/cri-o-centos \
554+
-e openshift_crio_systemcontainer_image_override=&#34;\${crio_image}&#34; \
540555
-e etcd_data_dir=&#34;\${ETCD_DATA_DIR}&#34; \
541556
-e openshift_master_default_subdomain=&#34;\${local_ip}.nip.io&#34; \
542557
-e openshift_pkg_version=&#34;\$( cat ./ORIGIN_PKG_VERSION )&#34; \
@@ -563,6 +578,21 @@ if [[ -s &#34;\${playbook_base}/openshift-node/network_manager.yml&#34; ]]; then
563578
else
564579
playbook=&#34;\${playbook_base}byo/openshift-node/network_manager.yml&#34;
565580
fi
581+
crio_tag=&#34;\$( cat ./ORIGIN_PKG_VERSION | grep -Po &#39;\d.\d&#39; )&#34;
582+
case \$crio_tag in
583+
&#34;3.7&#34;)
584+
crio_image=&#34;docker.io/runcom/cri-o-system-container:v3.7&#34;
585+
;;
586+
&#34;3.8&#34;)
587+
crio_image=&#34;docker.io/runcom/cri-o-system-container:v3.8&#34;
588+
;;
589+
&#34;3.9&#34;)
590+
crio_image=&#34;docker.io/runcom/cri-o-system-container:v3.9&#34;
591+
;;
592+
&#34;&#34;|*)
593+
crio_image=&#34;docker.io/runcom/cri-o-system-container:latest&#34;
594+
;;
595+
esac
566596
local_ip=&#34;\$( curl http://169.254.169.254/latest/meta-data/local-ipv4 )&#34;
567597
ansible-playbook -vv --become \
568598
--become-user root \
@@ -581,7 +611,7 @@ ansible-playbook -vv --become \
581611
--inventory sjb/inventory/ \
582612
-e deployment_type=origin \
583613
-e openshift_use_crio=True \
584-
-e openshift_crio_systemcontainer_image_override=docker.io/gscrivano/cri-o-centos \
614+
-e openshift_crio_systemcontainer_image_override=&#34;\${crio_image}&#34; \
585615
-e etcd_data_dir=&#34;\${ETCD_DATA_DIR}&#34; \
586616
-e openshift_master_default_subdomain=&#34;\${local_ip}.nip.io&#34; \
587617
-e openshift_pkg_version=&#34;\$( cat ./ORIGIN_PKG_VERSION )&#34; \
@@ -677,16 +707,17 @@ rm -rf &#34;${ARTIFACT_DIR}&#34;
677707
mkdir &#34;${ARTIFACT_DIR}&#34;
678708
ssh -F ./.config/origin-ci-tool/inventory/.ssh_config openshiftdevel &#34;sudo cat /etc/crio/crio.conf 2&gt;&amp;1&#34; &gt;&gt; &#34;${ARTIFACT_DIR}/crio.conf&#34; || true
679709
ssh -F ./.config/origin-ci-tool/inventory/.ssh_config openshiftdevel &#34;sudo docker version &amp;&amp; sudo docker info &amp;&amp; sudo docker images &amp;&amp; sudo docker ps -a 2&gt;&amp;1&#34; &gt;&gt; &#34;${ARTIFACT_DIR}/docker.info&#34; || true
710+
ssh -F ./.config/origin-ci-tool/inventory/.ssh_config openshiftdevel &#34;sudo runc exec -t cri-o crio --version 2&gt;&amp;1&#34; &gt;&gt; &#34;${ARTIFACT_DIR}/crio.commit&#34; || true
680711
ssh -F ./.config/origin-ci-tool/inventory/.ssh_config openshiftdevel &#34;sudo cat /etc/sysconfig/docker /etc/sysconfig/docker-network /etc/sysconfig/docker-storage /etc/sysconfig/docker-storage-setup /etc/systemd/system/docker.service 2&gt;&amp;1&#34; &gt;&gt; &#34;${ARTIFACT_DIR}/docker.config&#34; || true
681712
ssh -F ./.config/origin-ci-tool/inventory/.ssh_config openshiftdevel &#34;sudo cat /var/log/audit/audit.log 2&gt;&amp;1&#34; &gt;&gt; &#34;${ARTIFACT_DIR}/auditd.log&#34; || true
682713
ssh -F ./.config/origin-ci-tool/inventory/.ssh_config openshiftdevel &#34;oc get --raw /metrics --server=https://\$( uname --nodename ):10250 --config=/etc/origin/master/admin.kubeconfig 2&gt;&amp;1&#34; &gt;&gt; &#34;${ARTIFACT_DIR}/node-metrics.log&#34; || true
683714
ssh -F ./.config/origin-ci-tool/inventory/.ssh_config openshiftdevel &#34;sudo ausearch -m AVC -m SELINUX_ERR -m USER_AVC 2&gt;&amp;1&#34; &gt;&gt; &#34;${ARTIFACT_DIR}/avc_denials.log&#34; || true
684-
ssh -F ./.config/origin-ci-tool/inventory/.ssh_config openshiftdevel &#34;dmesg 2&gt;&amp;1&#34; &gt;&gt; &#34;${ARTIFACT_DIR}/dmesg.log&#34; || true
715+
ssh -F ./.config/origin-ci-tool/inventory/.ssh_config openshiftdevel &#34;sudo ausearch -m avc -ts recent 2&gt;&amp;1&#34; &gt;&gt; &#34;${ARTIFACT_DIR}/avc_selinux_denials.log&#34; || true
685716
ssh -F ./.config/origin-ci-tool/inventory/.ssh_config openshiftdevel &#34;oc get --raw /metrics --config=/etc/origin/master/admin.kubeconfig 2&gt;&amp;1&#34; &gt;&gt; &#34;${ARTIFACT_DIR}/master-metrics.log&#34; || true
686717
ssh -F ./.config/origin-ci-tool/inventory/.ssh_config openshiftdevel &#34;sudo df -h &amp;&amp; sudo pvs &amp;&amp; sudo vgs &amp;&amp; sudo lvs 2&gt;&amp;1&#34; &gt;&gt; &#34;${ARTIFACT_DIR}/filesystem.info&#34; || true
687718
ssh -F ./.config/origin-ci-tool/inventory/.ssh_config openshiftdevel &#34;sudo journalctl -xe 2&gt;&amp;1&#34; &gt;&gt; &#34;${ARTIFACT_DIR}/journal_xe.log&#34; || true
688719
ssh -F ./.config/origin-ci-tool/inventory/.ssh_config openshiftdevel &#34;sudo yum list installed 2&gt;&amp;1&#34; &gt;&gt; &#34;${ARTIFACT_DIR}/installed_packages.log&#34; || true
689-
ssh -F ./.config/origin-ci-tool/inventory/.ssh_config openshiftdevel &#34;sudo ausearch -m avc -ts recent 2&gt;&amp;1&#34; &gt;&gt; &#34;${ARTIFACT_DIR}/avc_selinux_denials.log&#34; || true
720+
ssh -F ./.config/origin-ci-tool/inventory/.ssh_config openshiftdevel &#34;dmesg 2&gt;&amp;1&#34; &gt;&gt; &#34;${ARTIFACT_DIR}/dmesg.log&#34; || true
690721
ssh -F ./.config/origin-ci-tool/inventory/.ssh_config openshiftdevel &#34;sudo journalctl _PID=1 --no-pager --all --lines=all 2&gt;&amp;1&#34; &gt;&gt; &#34;${ARTIFACT_DIR}/pid1.journal&#34; || true
691722
tree &#34;${ARTIFACT_DIR}&#34; </command>
692723
</hudson.tasks.Shell>

‎sjb/generated/test_pull_request_openshift_ansible_extended_conformance_install_crio.xml

Lines changed: 35 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -629,14 +629,29 @@ cat &lt;&lt;SCRIPT &gt;&#34;${script}&#34;
629629
#!/bin/bash
630630
set -o errexit -o nounset -o pipefail -o xtrace
631631
cd &#34;\${GOPATH}/src/github.com/openshift/aos-cd-jobs&#34;
632+
crio_tag=&#34;\$( cat ./ORIGIN_PKG_VERSION | grep -Po &#39;\d.\d&#39; )&#34;
633+
case \$crio_tag in
634+
&#34;3.7&#34;)
635+
crio_image=&#34;docker.io/runcom/cri-o-system-container:v3.7&#34;
636+
;;
637+
&#34;3.8&#34;)
638+
crio_image=&#34;docker.io/runcom/cri-o-system-container:v3.8&#34;
639+
;;
640+
&#34;3.9&#34;)
641+
crio_image=&#34;docker.io/runcom/cri-o-system-container:v3.9&#34;
642+
;;
643+
&#34;&#34;|*)
644+
crio_image=&#34;docker.io/runcom/cri-o-system-container:latest&#34;
645+
;;
646+
esac
632647
local_ip=&#34;\$( curl http://169.254.169.254/latest/meta-data/local-ipv4 )&#34;
633648
ansible-playbook -vv --become \
634649
--become-user root \
635650
--connection local \
636651
--inventory sjb/inventory/ \
637652
-e deployment_type=origin \
638653
-e openshift_use_crio=True \
639-
-e openshift_crio_systemcontainer_image_override=docker.io/gscrivano/cri-o-centos \
654+
-e openshift_crio_systemcontainer_image_override=&#34;\${crio_image}&#34; \
640655
-e etcd_data_dir=&#34;\${ETCD_DATA_DIR}&#34; \
641656
-e openshift_master_default_subdomain=&#34;\${local_ip}.nip.io&#34; \
642657
-e openshift_pkg_version=&#34;\$( cat ./ORIGIN_PKG_VERSION )&#34; \
@@ -663,6 +678,21 @@ if [[ -s &#34;\${playbook_base}/openshift-node/network_manager.yml&#34; ]]; then
663678
else
664679
playbook=&#34;\${playbook_base}byo/openshift-node/network_manager.yml&#34;
665680
fi
681+
crio_tag=&#34;\$( cat ./ORIGIN_PKG_VERSION | grep -Po &#39;\d.\d&#39; )&#34;
682+
case \$crio_tag in
683+
&#34;3.7&#34;)
684+
crio_image=&#34;docker.io/runcom/cri-o-system-container:v3.7&#34;
685+
;;
686+
&#34;3.8&#34;)
687+
crio_image=&#34;docker.io/runcom/cri-o-system-container:v3.8&#34;
688+
;;
689+
&#34;3.9&#34;)
690+
crio_image=&#34;docker.io/runcom/cri-o-system-container:v3.9&#34;
691+
;;
692+
&#34;&#34;|*)
693+
crio_image=&#34;docker.io/runcom/cri-o-system-container:latest&#34;
694+
;;
695+
esac
666696
local_ip=&#34;\$( curl http://169.254.169.254/latest/meta-data/local-ipv4 )&#34;
667697
ansible-playbook -vv --become \
668698
--become-user root \
@@ -681,7 +711,7 @@ ansible-playbook -vv --become \
681711
--inventory sjb/inventory/ \
682712
-e deployment_type=origin \
683713
-e openshift_use_crio=True \
684-
-e openshift_crio_systemcontainer_image_override=docker.io/gscrivano/cri-o-centos \
714+
-e openshift_crio_systemcontainer_image_override=&#34;\${crio_image}&#34; \
685715
-e etcd_data_dir=&#34;\${ETCD_DATA_DIR}&#34; \
686716
-e openshift_master_default_subdomain=&#34;\${local_ip}.nip.io&#34; \
687717
-e openshift_pkg_version=&#34;\$( cat ./ORIGIN_PKG_VERSION )&#34; \
@@ -777,16 +807,17 @@ rm -rf &#34;${ARTIFACT_DIR}&#34;
777807
mkdir &#34;${ARTIFACT_DIR}&#34;
778808
ssh -F ./.config/origin-ci-tool/inventory/.ssh_config openshiftdevel &#34;sudo cat /etc/crio/crio.conf 2&gt;&amp;1&#34; &gt;&gt; &#34;${ARTIFACT_DIR}/crio.conf&#34; || true
779809
ssh -F ./.config/origin-ci-tool/inventory/.ssh_config openshiftdevel &#34;sudo docker version &amp;&amp; sudo docker info &amp;&amp; sudo docker images &amp;&amp; sudo docker ps -a 2&gt;&amp;1&#34; &gt;&gt; &#34;${ARTIFACT_DIR}/docker.info&#34; || true
810+
ssh -F ./.config/origin-ci-tool/inventory/.ssh_config openshiftdevel &#34;sudo runc exec -t cri-o crio --version 2&gt;&amp;1&#34; &gt;&gt; &#34;${ARTIFACT_DIR}/crio.commit&#34; || true
780811
ssh -F ./.config/origin-ci-tool/inventory/.ssh_config openshiftdevel &#34;sudo cat /etc/sysconfig/docker /etc/sysconfig/docker-network /etc/sysconfig/docker-storage /etc/sysconfig/docker-storage-setup /etc/systemd/system/docker.service 2&gt;&amp;1&#34; &gt;&gt; &#34;${ARTIFACT_DIR}/docker.config&#34; || true
781812
ssh -F ./.config/origin-ci-tool/inventory/.ssh_config openshiftdevel &#34;sudo cat /var/log/audit/audit.log 2&gt;&amp;1&#34; &gt;&gt; &#34;${ARTIFACT_DIR}/auditd.log&#34; || true
782813
ssh -F ./.config/origin-ci-tool/inventory/.ssh_config openshiftdevel &#34;oc get --raw /metrics --server=https://\$( uname --nodename ):10250 --config=/etc/origin/master/admin.kubeconfig 2&gt;&amp;1&#34; &gt;&gt; &#34;${ARTIFACT_DIR}/node-metrics.log&#34; || true
783814
ssh -F ./.config/origin-ci-tool/inventory/.ssh_config openshiftdevel &#34;sudo ausearch -m AVC -m SELINUX_ERR -m USER_AVC 2&gt;&amp;1&#34; &gt;&gt; &#34;${ARTIFACT_DIR}/avc_denials.log&#34; || true
784-
ssh -F ./.config/origin-ci-tool/inventory/.ssh_config openshiftdevel &#34;dmesg 2&gt;&amp;1&#34; &gt;&gt; &#34;${ARTIFACT_DIR}/dmesg.log&#34; || true
815+
ssh -F ./.config/origin-ci-tool/inventory/.ssh_config openshiftdevel &#34;sudo ausearch -m avc -ts recent 2&gt;&amp;1&#34; &gt;&gt; &#34;${ARTIFACT_DIR}/avc_selinux_denials.log&#34; || true
785816
ssh -F ./.config/origin-ci-tool/inventory/.ssh_config openshiftdevel &#34;oc get --raw /metrics --config=/etc/origin/master/admin.kubeconfig 2&gt;&amp;1&#34; &gt;&gt; &#34;${ARTIFACT_DIR}/master-metrics.log&#34; || true
786817
ssh -F ./.config/origin-ci-tool/inventory/.ssh_config openshiftdevel &#34;sudo df -h &amp;&amp; sudo pvs &amp;&amp; sudo vgs &amp;&amp; sudo lvs 2&gt;&amp;1&#34; &gt;&gt; &#34;${ARTIFACT_DIR}/filesystem.info&#34; || true
787818
ssh -F ./.config/origin-ci-tool/inventory/.ssh_config openshiftdevel &#34;sudo journalctl -xe 2&gt;&amp;1&#34; &gt;&gt; &#34;${ARTIFACT_DIR}/journal_xe.log&#34; || true
788819
ssh -F ./.config/origin-ci-tool/inventory/.ssh_config openshiftdevel &#34;sudo yum list installed 2&gt;&amp;1&#34; &gt;&gt; &#34;${ARTIFACT_DIR}/installed_packages.log&#34; || true
789-
ssh -F ./.config/origin-ci-tool/inventory/.ssh_config openshiftdevel &#34;sudo ausearch -m avc -ts recent 2&gt;&amp;1&#34; &gt;&gt; &#34;${ARTIFACT_DIR}/avc_selinux_denials.log&#34; || true
820+
ssh -F ./.config/origin-ci-tool/inventory/.ssh_config openshiftdevel &#34;dmesg 2&gt;&amp;1&#34; &gt;&gt; &#34;${ARTIFACT_DIR}/dmesg.log&#34; || true
790821
ssh -F ./.config/origin-ci-tool/inventory/.ssh_config openshiftdevel &#34;sudo journalctl _PID=1 --no-pager --all --lines=all 2&gt;&amp;1&#34; &gt;&gt; &#34;${ARTIFACT_DIR}/pid1.journal&#34; || true
791822
tree &#34;${ARTIFACT_DIR}&#34; </command>
792823
</hudson.tasks.Shell>

0 commit comments

Comments
 (0)