Skip to content
This repository has been archived by the owner on May 6, 2020. It is now read-only.

Commit

Permalink
ci: Install kernel and image with install_asset.sh
Browse files Browse the repository at this point in the history
Also remove installation from fedora and ubuntu scripts and refactor
in setup.sh

Signed-off-by: Jose Carlos Venegas Munoz <jose.carlos.venegas.munoz@intel.com>
  • Loading branch information
jcvenegas committed Feb 1, 2018
1 parent 15727ce commit c11957b
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 14 deletions.
6 changes: 6 additions & 0 deletions .ci/setup.sh
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,12 @@ if [ -n "$PULL_REQUEST_NUMBER" ] || [ -n "$LOCALCI_PR_NUMBER" ]; then
bash -f "${cidir}/run_fetch_branches_tool.sh"
fi

echo "Install Clear containers image"
"${cidir}/install_asset.sh" "image" "latest"

echo "Install Clear Containers Kernel"
"${cidir}/install_asset.sh" "kernel" "latest"

echo "Install shim"
bash -f ${cidir}/install_shim.sh

Expand Down
6 changes: 0 additions & 6 deletions .ci/setup_env_fedora.sh
Original file line number Diff line number Diff line change
Expand Up @@ -44,12 +44,6 @@ chronic sudo -E dnf -y install libtool automake autoconf bc pixman numactl-libs
echo "Install qemu-lite binary"
"${cidir}/install_qemu_lite.sh" "${qemu_lite_clear_release}" "${qemu_lite_sha}" "$ID"

echo "Install clear-containers image"
"${cidir}/install_clear_image.sh" "$clear_vm_image_version" "${cc_image_path}"

echo "Install Clear Containers Kernel"
"${cidir}/install_clearcontainers_kernel.sh" "latest"

echo "Install CRI-O dependencies"
chronic sudo -E dnf -y install btrfs-progs-devel device-mapper-devel \
glib2-devel glibc-devel glibc-static gpgme-devel libassuan-devel \
Expand Down
8 changes: 0 additions & 8 deletions .ci/setup_env_ubuntu.sh
Original file line number Diff line number Diff line change
Expand Up @@ -21,8 +21,6 @@ source "/etc/os-release"
source "${cidir}/lib.sh"
get_cc_versions

cc_image_path="/usr/share/clear-containers"

if grep -q "N" /sys/module/kvm_intel/parameters/nested; then
echo "enable Nested Virtualization"
sudo modprobe -r kvm_intel
Expand All @@ -44,9 +42,6 @@ chronic sudo -E apt install -y libtool automake autotools-dev autoconf bc alien
echo "Install qemu-lite binary"
"${cidir}/install_qemu_lite.sh" "${qemu_lite_clear_release}" "${qemu_lite_sha}" "$ID"

echo "Install clear-containers image"
"${cidir}/install_clear_image.sh" "$clear_vm_image_version" "${cc_image_path}"

echo "Install CRI-O dependencies for all Ubuntu versions"
chronic sudo -E apt install -y libglib2.0-dev libseccomp-dev libapparmor-dev libgpgme11-dev

Expand All @@ -56,12 +51,9 @@ chronic sudo -E apt install -y bison
echo "Install libudev-dev"
chronic sudo -E apt-get install -y libudev-dev


echo "Install Build Tools"
sudo -E apt install -y build-essential python pkg-config zlib1g-dev

echo "Install Clear Containers Kernel"
"${cidir}/install_clearcontainers_kernel.sh" "latest"

echo -e "Install CRI-O dependencies available for Ubuntu $VERSION_ID"
sudo -E apt install -y libdevmapper-dev btrfs-tools util-linux
Expand Down

0 comments on commit c11957b

Please sign in to comment.