Skip to content

Commit bb41f5f

Browse files
runcomruncom
committed
CRI-O: match version against openshift
Signed-off-by: Antonio Murdaca <[email protected]>
1 parent 14be97d commit bb41f5f

4 files changed

+74
-10
lines changed

‎sjb/config/test_cases/test_branch_origin_extended_conformance_crio.yml

Lines changed: 17 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -119,6 +119,21 @@ extensions:
119119
else
120120
playbook="${playbook_base}byo/openshift-node/network_manager.yml"
121121
fi
122+
crio_tag="$( cat ./ORIGIN_PKG_VERSION | grep -Po '\d.\d' )"
123+
case $crio_tag in
124+
"3.7")
125+
crio_image="docker.io/runcom/cri-o-system-container:v3.7"
126+
;;
127+
"3.8")
128+
crio_image="docker.io/runcom/cri-o-system-container:v3.8"
129+
;;
130+
"3.9")
131+
crio_image="docker.io/runcom/cri-o-system-container:v3.9"
132+
;;
133+
""|*)
134+
crio_image="docker.io/runcom/cri-o-system-container:latest"
135+
;;
136+
esac
122137
local_ip="$( curl http://169.254.169.254/latest/meta-data/local-ipv4 )"
123138
ansible-playbook -vv --become \
124139
--become-user root \
@@ -137,7 +152,7 @@ extensions:
137152
--inventory sjb/inventory/ \
138153
-e deployment_type=origin \
139154
-e openshift_use_crio=True \
140-
-e openshift_crio_systemcontainer_image_override=docker.io/gscrivano/cri-o-centos \
155+
-e openshift_crio_systemcontainer_image_override="${crio_image}" \
141156
-e etcd_data_dir="${ETCD_DATA_DIR}" \
142157
-e openshift_master_default_subdomain="${local_ip}.nip.io" \
143158
-e openshift_pkg_version="$( cat ./ORIGIN_PKG_VERSION )" \
@@ -169,6 +184,7 @@ extensions:
169184
- /etc/crio
170185
- /etc/systemd/system
171186
generated_artifacts:
187+
crio.commit: "sudo runc exec -t cri-o crio --version"
172188
dmesg.log: "dmesg"
173189
journal_xe.log: "sudo journalctl -xe"
174190
avc_selinux_denials.log: 'sudo ausearch -m avc -ts recent'

‎sjb/generated/test_branch_origin_extended_conformance_crio.xml

Lines changed: 19 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -563,6 +563,21 @@ if [[ -s &#34;\${playbook_base}/openshift-node/network_manager.yml&#34; ]]; then
563563
else
564564
playbook=&#34;\${playbook_base}byo/openshift-node/network_manager.yml&#34;
565565
fi
566+
crio_tag=&#34;\$( cat ./ORIGIN_PKG_VERSION | grep -Po &#39;\d.\d&#39; )&#34;
567+
case \$crio_tag in
568+
&#34;3.7&#34;)
569+
crio_image=&#34;docker.io/runcom/cri-o-system-container:v3.7&#34;
570+
;;
571+
&#34;3.8&#34;)
572+
crio_image=&#34;docker.io/runcom/cri-o-system-container:v3.8&#34;
573+
;;
574+
&#34;3.9&#34;)
575+
crio_image=&#34;docker.io/runcom/cri-o-system-container:v3.9&#34;
576+
;;
577+
&#34;&#34;|*)
578+
crio_image=&#34;docker.io/runcom/cri-o-system-container:latest&#34;
579+
;;
580+
esac
566581
local_ip=&#34;\$( curl http://169.254.169.254/latest/meta-data/local-ipv4 )&#34;
567582
ansible-playbook -vv --become \
568583
--become-user root \
@@ -581,7 +596,7 @@ ansible-playbook -vv --become \
581596
--inventory sjb/inventory/ \
582597
-e deployment_type=origin \
583598
-e openshift_use_crio=True \
584-
-e openshift_crio_systemcontainer_image_override=docker.io/gscrivano/cri-o-centos \
599+
-e openshift_crio_systemcontainer_image_override=&#34;\${crio_image}&#34; \
585600
-e etcd_data_dir=&#34;\${ETCD_DATA_DIR}&#34; \
586601
-e openshift_master_default_subdomain=&#34;\${local_ip}.nip.io&#34; \
587602
-e openshift_pkg_version=&#34;\$( cat ./ORIGIN_PKG_VERSION )&#34; \
@@ -677,16 +692,17 @@ rm -rf &#34;${ARTIFACT_DIR}&#34;
677692
mkdir &#34;${ARTIFACT_DIR}&#34;
678693
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
679694
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
695+
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
680696
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
681697
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
682698
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
683699
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
700+
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
685701
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
686702
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
687703
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
688704
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
705+
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
690706
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
691707
tree &#34;${ARTIFACT_DIR}&#34; </command>
692708
</hudson.tasks.Shell>

‎sjb/generated/test_pull_request_openshift_ansible_extended_conformance_install_crio.xml

Lines changed: 19 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -663,6 +663,21 @@ if [[ -s &#34;\${playbook_base}/openshift-node/network_manager.yml&#34; ]]; then
663663
else
664664
playbook=&#34;\${playbook_base}byo/openshift-node/network_manager.yml&#34;
665665
fi
666+
crio_tag=&#34;\$( cat ./ORIGIN_PKG_VERSION | grep -Po &#39;\d.\d&#39; )&#34;
667+
case \$crio_tag in
668+
&#34;3.7&#34;)
669+
crio_image=&#34;docker.io/runcom/cri-o-system-container:v3.7&#34;
670+
;;
671+
&#34;3.8&#34;)
672+
crio_image=&#34;docker.io/runcom/cri-o-system-container:v3.8&#34;
673+
;;
674+
&#34;3.9&#34;)
675+
crio_image=&#34;docker.io/runcom/cri-o-system-container:v3.9&#34;
676+
;;
677+
&#34;&#34;|*)
678+
crio_image=&#34;docker.io/runcom/cri-o-system-container:latest&#34;
679+
;;
680+
esac
666681
local_ip=&#34;\$( curl http://169.254.169.254/latest/meta-data/local-ipv4 )&#34;
667682
ansible-playbook -vv --become \
668683
--become-user root \
@@ -681,7 +696,7 @@ ansible-playbook -vv --become \
681696
--inventory sjb/inventory/ \
682697
-e deployment_type=origin \
683698
-e openshift_use_crio=True \
684-
-e openshift_crio_systemcontainer_image_override=docker.io/gscrivano/cri-o-centos \
699+
-e openshift_crio_systemcontainer_image_override=&#34;\${crio_image}&#34; \
685700
-e etcd_data_dir=&#34;\${ETCD_DATA_DIR}&#34; \
686701
-e openshift_master_default_subdomain=&#34;\${local_ip}.nip.io&#34; \
687702
-e openshift_pkg_version=&#34;\$( cat ./ORIGIN_PKG_VERSION )&#34; \
@@ -777,16 +792,17 @@ rm -rf &#34;${ARTIFACT_DIR}&#34;
777792
mkdir &#34;${ARTIFACT_DIR}&#34;
778793
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
779794
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
795+
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
780796
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
781797
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
782798
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
783799
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
800+
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
785801
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
786802
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
787803
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
788804
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
805+
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
790806
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
791807
tree &#34;${ARTIFACT_DIR}&#34; </command>
792808
</hudson.tasks.Shell>

‎sjb/generated/test_pull_request_origin_extended_conformance_crio.xml

Lines changed: 19 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -663,6 +663,21 @@ if [[ -s &#34;\${playbook_base}/openshift-node/network_manager.yml&#34; ]]; then
663663
else
664664
playbook=&#34;\${playbook_base}byo/openshift-node/network_manager.yml&#34;
665665
fi
666+
crio_tag=&#34;\$( cat ./ORIGIN_PKG_VERSION | grep -Po &#39;\d.\d&#39; )&#34;
667+
case \$crio_tag in
668+
&#34;3.7&#34;)
669+
crio_image=&#34;docker.io/runcom/cri-o-system-container:v3.7&#34;
670+
;;
671+
&#34;3.8&#34;)
672+
crio_image=&#34;docker.io/runcom/cri-o-system-container:v3.8&#34;
673+
;;
674+
&#34;3.9&#34;)
675+
crio_image=&#34;docker.io/runcom/cri-o-system-container:v3.9&#34;
676+
;;
677+
&#34;&#34;|*)
678+
crio_image=&#34;docker.io/runcom/cri-o-system-container:latest&#34;
679+
;;
680+
esac
666681
local_ip=&#34;\$( curl http://169.254.169.254/latest/meta-data/local-ipv4 )&#34;
667682
ansible-playbook -vv --become \
668683
--become-user root \
@@ -681,7 +696,7 @@ ansible-playbook -vv --become \
681696
--inventory sjb/inventory/ \
682697
-e deployment_type=origin \
683698
-e openshift_use_crio=True \
684-
-e openshift_crio_systemcontainer_image_override=docker.io/gscrivano/cri-o-centos \
699+
-e openshift_crio_systemcontainer_image_override=&#34;\${crio_image}&#34; \
685700
-e etcd_data_dir=&#34;\${ETCD_DATA_DIR}&#34; \
686701
-e openshift_master_default_subdomain=&#34;\${local_ip}.nip.io&#34; \
687702
-e openshift_pkg_version=&#34;\$( cat ./ORIGIN_PKG_VERSION )&#34; \
@@ -777,16 +792,17 @@ rm -rf &#34;${ARTIFACT_DIR}&#34;
777792
mkdir &#34;${ARTIFACT_DIR}&#34;
778793
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
779794
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
795+
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
780796
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
781797
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
782798
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
783799
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
800+
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
785801
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
786802
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
787803
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
788804
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
805+
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
790806
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
791807
tree &#34;${ARTIFACT_DIR}&#34; </command>
792808
</hudson.tasks.Shell>

0 commit comments

Comments
 (0)