Skip to content

CRI-O: match version against openshift #901

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
sdodson merged 1 commit into from
Dec 13, 2017
Merged

CRI-O: match version against openshift #901

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
35 changes: 33 additions & 2 deletions sjb/config/test_cases/test_branch_origin_extended_conformance_crio.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -93,14 +93,29 @@ extensions:
title: "origin prerequisites"
repository: "aos-cd-jobs"
script: |-
crio_tag="$( cat ./ORIGIN_PKG_VERSION | grep -Po '\d.\d' )"
case $crio_tag in
"3.7")
crio_image="docker.io/runcom/cri-o-system-container:v3.7"
;;
"3.8")
crio_image="docker.io/runcom/cri-o-system-container:v3.8"
;;
"3.9")
crio_image="docker.io/runcom/cri-o-system-container:v3.9"
;;
""|*)
crio_image="docker.io/runcom/cri-o-system-container:latest"
;;
esac
local_ip="$( curl http://169.254.169.254/latest/meta-data/local-ipv4 )"
ansible-playbook -vv --become \
--become-user root \
--connection local \
--inventory sjb/inventory/ \
-e deployment_type=origin \
-e openshift_use_crio=True \
-e openshift_crio_systemcontainer_image_override=docker.io/gscrivano/cri-o-centos \
-e openshift_crio_systemcontainer_image_override="${crio_image}" \
-e etcd_data_dir="${ETCD_DATA_DIR}" \
-e openshift_master_default_subdomain="${local_ip}.nip.io" \
-e openshift_pkg_version="$( cat ./ORIGIN_PKG_VERSION )" \
Expand All @@ -119,6 +134,21 @@ extensions:
else
playbook="${playbook_base}byo/openshift-node/network_manager.yml"
fi
crio_tag="$( cat ./ORIGIN_PKG_VERSION | grep -Po '\d.\d' )"
case $crio_tag in
"3.7")
crio_image="docker.io/runcom/cri-o-system-container:v3.7"
;;
"3.8")
crio_image="docker.io/runcom/cri-o-system-container:v3.8"
;;
"3.9")
crio_image="docker.io/runcom/cri-o-system-container:v3.9"
;;
""|*)
crio_image="docker.io/runcom/cri-o-system-container:latest"
;;
esac
local_ip="$( curl http://169.254.169.254/latest/meta-data/local-ipv4 )"
ansible-playbook -vv --become \
--become-user root \
Expand All @@ -137,7 +167,7 @@ extensions:
--inventory sjb/inventory/ \
-e deployment_type=origin \
-e openshift_use_crio=True \
-e openshift_crio_systemcontainer_image_override=docker.io/gscrivano/cri-o-centos \
-e openshift_crio_systemcontainer_image_override="${crio_image}" \
-e etcd_data_dir="${ETCD_DATA_DIR}" \
-e openshift_master_default_subdomain="${local_ip}.nip.io" \
-e openshift_pkg_version="$( cat ./ORIGIN_PKG_VERSION )" \
Expand Down Expand Up @@ -169,6 +199,7 @@ extensions:
- /etc/crio
- /etc/systemd/system
generated_artifacts:
crio.commit: "sudo runc exec -t cri-o crio --version"
dmesg.log: "dmesg"
journal_xe.log: "sudo journalctl -xe"
avc_selinux_denials.log: 'sudo ausearch -m avc -ts recent'
Expand Down
39 changes: 35 additions & 4 deletions sjb/generated/test_branch_origin_extended_conformance_crio.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -529,14 +529,29 @@ cat <<SCRIPT >"${script}"
#!/bin/bash
set -o errexit -o nounset -o pipefail -o xtrace
cd "\${GOPATH}/src/github.com/openshift/aos-cd-jobs"
crio_tag="\$( cat ./ORIGIN_PKG_VERSION | grep -Po '\d.\d' )"
case \$crio_tag in
"3.7")
crio_image="docker.io/runcom/cri-o-system-container:v3.7"
;;
"3.8")
crio_image="docker.io/runcom/cri-o-system-container:v3.8"
;;
"3.9")
crio_image="docker.io/runcom/cri-o-system-container:v3.9"
;;
""|*)
crio_image="docker.io/runcom/cri-o-system-container:latest"
;;
esac
local_ip="\$( curl http://169.254.169.254/latest/meta-data/local-ipv4 )"
ansible-playbook -vv --become \
--become-user root \
--connection local \
--inventory sjb/inventory/ \
-e deployment_type=origin \
-e openshift_use_crio=True \
-e openshift_crio_systemcontainer_image_override=docker.io/gscrivano/cri-o-centos \
-e openshift_crio_systemcontainer_image_override="\${crio_image}" \
-e etcd_data_dir="\${ETCD_DATA_DIR}" \
-e openshift_master_default_subdomain="\${local_ip}.nip.io" \
-e openshift_pkg_version="\$( cat ./ORIGIN_PKG_VERSION )" \
Expand All @@ -563,6 +578,21 @@ if [[ -s "\${playbook_base}/openshift-node/network_manager.yml" ]]; then
else
playbook="\${playbook_base}byo/openshift-node/network_manager.yml"
fi
crio_tag="\$( cat ./ORIGIN_PKG_VERSION | grep -Po '\d.\d' )"
case \$crio_tag in
"3.7")
crio_image="docker.io/runcom/cri-o-system-container:v3.7"
;;
"3.8")
crio_image="docker.io/runcom/cri-o-system-container:v3.8"
;;
"3.9")
crio_image="docker.io/runcom/cri-o-system-container:v3.9"
;;
""|*)
crio_image="docker.io/runcom/cri-o-system-container:latest"
;;
esac
local_ip="\$( curl http://169.254.169.254/latest/meta-data/local-ipv4 )"
ansible-playbook -vv --become \
--become-user root \
Expand All @@ -581,7 +611,7 @@ ansible-playbook -vv --become \
--inventory sjb/inventory/ \
-e deployment_type=origin \
-e openshift_use_crio=True \
-e openshift_crio_systemcontainer_image_override=docker.io/gscrivano/cri-o-centos \
-e openshift_crio_systemcontainer_image_override="\${crio_image}" \
-e etcd_data_dir="\${ETCD_DATA_DIR}" \
-e openshift_master_default_subdomain="\${local_ip}.nip.io" \
-e openshift_pkg_version="\$( cat ./ORIGIN_PKG_VERSION )" \
Expand Down Expand Up @@ -677,16 +707,17 @@ rm -rf "${ARTIFACT_DIR}"
mkdir "${ARTIFACT_DIR}"
ssh -F ./.config/origin-ci-tool/inventory/.ssh_config openshiftdevel "sudo cat /etc/crio/crio.conf 2>&1" >> "${ARTIFACT_DIR}/crio.conf" || true
ssh -F ./.config/origin-ci-tool/inventory/.ssh_config openshiftdevel "sudo docker version && sudo docker info && sudo docker images && sudo docker ps -a 2>&1" >> "${ARTIFACT_DIR}/docker.info" || true
ssh -F ./.config/origin-ci-tool/inventory/.ssh_config openshiftdevel "sudo runc exec -t cri-o crio --version 2>&1" >> "${ARTIFACT_DIR}/crio.commit" || true
ssh -F ./.config/origin-ci-tool/inventory/.ssh_config openshiftdevel "sudo cat /etc/sysconfig/docker /etc/sysconfig/docker-network /etc/sysconfig/docker-storage /etc/sysconfig/docker-storage-setup /etc/systemd/system/docker.service 2>&1" >> "${ARTIFACT_DIR}/docker.config" || true
ssh -F ./.config/origin-ci-tool/inventory/.ssh_config openshiftdevel "sudo cat /var/log/audit/audit.log 2>&1" >> "${ARTIFACT_DIR}/auditd.log" || true
ssh -F ./.config/origin-ci-tool/inventory/.ssh_config openshiftdevel "oc get --raw /metrics --server=https://\$( uname --nodename ):10250 --config=/etc/origin/master/admin.kubeconfig 2>&1" >> "${ARTIFACT_DIR}/node-metrics.log" || true
ssh -F ./.config/origin-ci-tool/inventory/.ssh_config openshiftdevel "sudo ausearch -m AVC -m SELINUX_ERR -m USER_AVC 2>&1" >> "${ARTIFACT_DIR}/avc_denials.log" || true
ssh -F ./.config/origin-ci-tool/inventory/.ssh_config openshiftdevel "dmesg 2>&1" >> "${ARTIFACT_DIR}/dmesg.log" || true
ssh -F ./.config/origin-ci-tool/inventory/.ssh_config openshiftdevel "sudo ausearch -m avc -ts recent 2>&1" >> "${ARTIFACT_DIR}/avc_selinux_denials.log" || true
ssh -F ./.config/origin-ci-tool/inventory/.ssh_config openshiftdevel "oc get --raw /metrics --config=/etc/origin/master/admin.kubeconfig 2>&1" >> "${ARTIFACT_DIR}/master-metrics.log" || true
ssh -F ./.config/origin-ci-tool/inventory/.ssh_config openshiftdevel "sudo df -h && sudo pvs && sudo vgs && sudo lvs 2>&1" >> "${ARTIFACT_DIR}/filesystem.info" || true
ssh -F ./.config/origin-ci-tool/inventory/.ssh_config openshiftdevel "sudo journalctl -xe 2>&1" >> "${ARTIFACT_DIR}/journal_xe.log" || true
ssh -F ./.config/origin-ci-tool/inventory/.ssh_config openshiftdevel "sudo yum list installed 2>&1" >> "${ARTIFACT_DIR}/installed_packages.log" || true
ssh -F ./.config/origin-ci-tool/inventory/.ssh_config openshiftdevel "sudo ausearch -m avc -ts recent 2>&1" >> "${ARTIFACT_DIR}/avc_selinux_denials.log" || true
ssh -F ./.config/origin-ci-tool/inventory/.ssh_config openshiftdevel "dmesg 2>&1" >> "${ARTIFACT_DIR}/dmesg.log" || true
ssh -F ./.config/origin-ci-tool/inventory/.ssh_config openshiftdevel "sudo journalctl _PID=1 --no-pager --all --lines=all 2>&1" >> "${ARTIFACT_DIR}/pid1.journal" || true
tree &#34;${ARTIFACT_DIR}&#34; </command>
</hudson.tasks.Shell>
Expand Down
39 changes: 35 additions & 4 deletions sjb/generated/test_pull_request_openshift_ansible_extended_conformance_install_crio.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -629,14 +629,29 @@ cat &lt;&lt;SCRIPT &gt;&#34;${script}&#34;
#!/bin/bash
set -o errexit -o nounset -o pipefail -o xtrace
cd &#34;\${GOPATH}/src/github.com/openshift/aos-cd-jobs&#34;
crio_tag=&#34;\$( cat ./ORIGIN_PKG_VERSION | grep -Po &#39;\d.\d&#39; )&#34;
case \$crio_tag in
&#34;3.7&#34;)
crio_image=&#34;docker.io/runcom/cri-o-system-container:v3.7&#34;
;;
&#34;3.8&#34;)
crio_image=&#34;docker.io/runcom/cri-o-system-container:v3.8&#34;
;;
&#34;3.9&#34;)
crio_image=&#34;docker.io/runcom/cri-o-system-container:v3.9&#34;
;;
&#34;&#34;|*)
crio_image=&#34;docker.io/runcom/cri-o-system-container:latest&#34;
;;
esac
local_ip=&#34;\$( curl http://169.254.169.254/latest/meta-data/local-ipv4 )&#34;
ansible-playbook -vv --become \
--become-user root \
--connection local \
--inventory sjb/inventory/ \
-e deployment_type=origin \
-e openshift_use_crio=True \
-e openshift_crio_systemcontainer_image_override=docker.io/gscrivano/cri-o-centos \
-e openshift_crio_systemcontainer_image_override=&#34;\${crio_image}&#34; \
-e etcd_data_dir=&#34;\${ETCD_DATA_DIR}&#34; \
-e openshift_master_default_subdomain=&#34;\${local_ip}.nip.io&#34; \
-e openshift_pkg_version=&#34;\$( cat ./ORIGIN_PKG_VERSION )&#34; \
Expand All @@ -663,6 +678,21 @@ if [[ -s &#34;\${playbook_base}/openshift-node/network_manager.yml&#34; ]]; then
else
playbook=&#34;\${playbook_base}byo/openshift-node/network_manager.yml&#34;
fi
crio_tag=&#34;\$( cat ./ORIGIN_PKG_VERSION | grep -Po &#39;\d.\d&#39; )&#34;
case \$crio_tag in
&#34;3.7&#34;)
crio_image=&#34;docker.io/runcom/cri-o-system-container:v3.7&#34;
;;
&#34;3.8&#34;)
crio_image=&#34;docker.io/runcom/cri-o-system-container:v3.8&#34;
;;
&#34;3.9&#34;)
crio_image=&#34;docker.io/runcom/cri-o-system-container:v3.9&#34;
;;
&#34;&#34;|*)
crio_image=&#34;docker.io/runcom/cri-o-system-container:latest&#34;
;;
esac
local_ip=&#34;\$( curl http://169.254.169.254/latest/meta-data/local-ipv4 )&#34;
ansible-playbook -vv --become \
--become-user root \
Expand All @@ -681,7 +711,7 @@ ansible-playbook -vv --become \
--inventory sjb/inventory/ \
-e deployment_type=origin \
-e openshift_use_crio=True \
-e openshift_crio_systemcontainer_image_override=docker.io/gscrivano/cri-o-centos \
-e openshift_crio_systemcontainer_image_override=&#34;\${crio_image}&#34; \
-e etcd_data_dir=&#34;\${ETCD_DATA_DIR}&#34; \
-e openshift_master_default_subdomain=&#34;\${local_ip}.nip.io&#34; \
-e openshift_pkg_version=&#34;\$( cat ./ORIGIN_PKG_VERSION )&#34; \
Expand Down Expand Up @@ -777,16 +807,17 @@ rm -rf &#34;${ARTIFACT_DIR}&#34;
mkdir &#34;${ARTIFACT_DIR}&#34;
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
tree &#34;${ARTIFACT_DIR}&#34; </command>
</hudson.tasks.Shell>
Expand Down
Loading