Skip to content

Commit

Permalink
add CRI test for stock containerd
Browse files Browse the repository at this point in the history
Signed-off-by: Shyam Jesal <s.jesalpura@gmail.com>
  • Loading branch information
shyamjesal committed Feb 27, 2021
1 parent 4fd5df0 commit c3ed625
Show file tree
Hide file tree
Showing 5 changed files with 34 additions and 4 deletions.
28 changes: 28 additions & 0 deletions .github/workflows/cri_tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -57,3 +57,31 @@ jobs:
- name: Cleaning
if: ${{ always() }}
run: ./scripts/github_runner/clean_cri_runner.sh

stock-containerd-test:
name: Stock Containerd test
runs-on: ubuntu-18.04

steps:
- name: Check out code into the Go module directory
uses: actions/checkout@v2

- name: Setup node
run: ./scripts/cloudlab/setup_node.sh no-vhive

- name: Start Containerd
run: sudo containerd &

- name: Create k8s cluster
run: ./scripts/cluster/create_one_node_cluster.sh no-vhive

- name: Sleep for 2 minutes
uses: jakejarvis/wait-action@master
with:
time: '2m'

- name: Create helloworld container
run: kn service apply helloworld -f ./configs/knative_workloads/helloworld.yaml



2 changes: 2 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,8 @@

### Added
- Support for MinIO S3 storage (non-replicated, non-distributed).
- MicroVMs can now access the internet by default using custom host interface. (default route interface is used if no argument is provided)
- Our Knative serving [fork](https://github.com/ease-lab/serving) now can be tested separately from vHive. More info [here](https://github.com/ease-lab/vhive/wiki/Debugging-Knative-functions).

### Changed

Expand Down
4 changes: 2 additions & 2 deletions scripts/cloudlab/setup_node.sh
Original file line number Diff line number Diff line change
Expand Up @@ -29,13 +29,13 @@ SCRIPTS=$ROOT/scripts
source $SCRIPTS/install_go.sh
$SCRIPTS/setup_system.sh

if [ $1 != "no-vhive" ]; then
if [ "$1" != "no-vhive" ]; then
$SCRIPTS/setup_firecracker_containerd.sh
fi

$SCRIPTS/install_stock.sh

if [ $1 != "no-vhive" ]; then
if [ "$1" != "no-vhive" ]; then
$SCRIPTS/create_devmapper.sh
fi

2 changes: 1 addition & 1 deletion scripts/cluster/create_one_node_cluster.sh
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ ROOT="$( cd $DIR && cd .. && cd .. && pwd)"
# Create kubelet service
$DIR/setup_worker_kubelet.sh $1

if [ $1 == "no-vhive" ]; then
if [ "$1" == "no-vhive" ]; then
CRI_SOCK="/run/containerd/containerd.sock"
else
CRI_SOCK="/etc/firecracker-containerd/fccd-cri.sock"
Expand Down
2 changes: 1 addition & 1 deletion scripts/cluster/setup_worker_kubelet.sh
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
# SOFTWARE.

if [ $1 == "no-vhive" ]; then
if [ "$1" == "no-vhive" ]; then
CRI_SOCK="/run/containerd/containerd.sock"
else
CRI_SOCK="/etc/firecracker-containerd/fccd-cri.sock"
Expand Down

0 comments on commit c3ed625

Please sign in to comment.