Skip to content

Commit

Permalink
Merge pull request #725 from klihub/release/prepare/0.6.0/ubuntu-21.04
Browse files Browse the repository at this point in the history
0.6.0 release preparation: ubuntu-21.04 cross-build and tests.
  • Loading branch information
klihub authored Oct 5, 2021
2 parents e9864b2 + 9ef667d commit 8414104
Show file tree
Hide file tree
Showing 7 changed files with 57 additions and 0 deletions.
35 changes: 35 additions & 0 deletions dockerfiles/cross-build/Dockerfile.ubuntu-21.04
Original file line number Diff line number Diff line change
@@ -0,0 +1,35 @@
# pull in base + a minimal set of useful packages
FROM ubuntu:21.04 as ubuntu-21.04-build

ARG GOLANG_VERSION=1.16.8
ARG GOLANG_URLDIR=https://dl.google.com/go
ARG CREATE_USER="test"
ARG USER_OPTIONS=""
ENV PATH /go/bin:/usr/local/go/bin:$PATH
ENV DEBIAN_FRONTEND noninteractive

# pull in stuff for building
RUN apt-get update && \
apt-get install -y --no-install-recommends \
tzdata build-essential fakeroot devscripts \
bash git make sed debhelper wget ca-certificates && \
rm -rf /var/lib/apt/lists/*

RUN arch="$(dpkg --print-architecture)"; \
case "${arch##*-}" in \
amd64) goarch=linux-amd64;; \
i386) goarch=linux-386;; \
armhf) goarch=linux-armv6l;; \
ppc64el) goarch=linux-ppc64le;; \
s390x) goarch=linux-s390x;; \
esac; \
\
wget $GOLANG_URLDIR/go$GOLANG_VERSION.$goarch.tar.gz -O go.tgz && \
tar -C /usr/local -xvzf go.tgz && rm go.tgz && \
\
export PATH="/usr/local/go/bin:$PATH" && \
echo "PATH=/usr/local/go/bin:$PATH" > /etc/profile.d/go.sh && \
go version

RUN [ -n "$CREATE_USER" -a "$CREATE_USER" != "root" ] && \
useradd -m -s /bin/bash $CREATE_USER $USER_OPTIONS
1 change: 1 addition & 0 deletions test/e2e/packages.test-suite/ubuntu-21.04/binsrc.var
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
packages/ubuntu-21.04
6 changes: 6 additions & 0 deletions test/e2e/packages.test-suite/ubuntu-21.04/cri-resmgr.cfg
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
policy:
Active: topology-aware
ReservedResources:
CPU: 750m
logger:
Debug: cri-resmgr,resource-manager,cache,policy
1 change: 1 addition & 0 deletions test/e2e/packages.test-suite/ubuntu-21.04/distro.var
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
ubuntu-21.04
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
# Clear cri-resmgr output from previous runs.
vm-command "journalctl --vacuum-time=1s"

# Create a pod.
create besteffort

# Verify that new pod was created by systemd-managed cri-resource-manager.
vm-command "journalctl -xeu cri-resource-manager | grep 'StartContainer: starting container pod0:pod0c0'" || {
command-error "failed to verify that systemd-managed cri-resource-manager launched the pod"
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
[
{"mem": "2G", "cores": 2, "nodes": 2, "packages": 2}
]
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
1

0 comments on commit 8414104

Please sign in to comment.