Merge pull request #37 from ruomengh/fix-ci

Fix ccnp example deployment and E2E test

Author: Ruomeng Hao

.github/workflows/e2e-test-k8s.yaml

@@ -18,7 +18,7 @@ jobs:
         uses: actions/[email protected]
       - name: Build and push CCNP images
         run: |
-          sudo ./container/build.sh -r gar-registry.caas.intel.com/cpio -g latest -c ccnp-server ccnp-example ccnp-device-plugin
+          sudo ./container/build.sh -r gar-registry.caas.intel.com/cpio -g latest
       - name: Deploy CCNP server
         run: |
           sudo ./deployment/kubernetes/script/deploy-ccnp.sh -r gar-registry.caas.intel.com/cpio -g latest -d

container/build.sh

@@ -165,7 +165,9 @@ function publish_images {
     if [[ "$container" == "all" ]]; then
         for item in "${all_containers[@]}"
         do
+        if [[ ${item} != "pccs" && ${item} != "qgs" ]] || [[ ${item} == "pccs" && ${pccs} == true ]] || [[ ${item} == "qgs" && ${qgs} == true ]] ; then
             publish_a_image "$item"
+	    fi
         done
     else
         publish_a_image "$container"

container/ccnp-example/Dockerfile

@@ -37,6 +37,6 @@ COPY --from=golang-builder /go/ccnp-sdk/example/go-sdk-example ./
 COPY --from=rust-builder ccnp-sdk/example/target/release/rust-sdk-example ./
 
 RUN apk update && apk add bash vim tar wget
-RUN pip install ./cctrusted_base*.whl ./ccnp*.whl && rm -f *.whl
+RUN pip install ./cctrusted_base*.whl ./ccnp*.whl pytest && rm -f *.whl
 
 ENTRYPOINT ["tail", "-f", "/dev/null"]

deployment/kubernetes/script/deploy-ccnp-example.sh

@@ -5,6 +5,7 @@ set -e
 
 DEFAULT_DOCKER_REPO=docker.io/library
 DEFAULT_TAG=latest
+WORK_DIR=$(cd "$(dirname "$0")" || exit; pwd)
 TEMP_MANIFEST_FILE=/tmp/ccnp-example-deployment.yaml
 DELETE_DEPLOYMENT=false
 
@@ -23,24 +24,27 @@ while getopts ":r:g:i:dmervh" option; do
     done
 
 echo "Deploy CCNP example for container measurement in Kubernetes"
+pushd "${WORK_DIR}/../../.." || exit
 # replace registry and image tag according to user input
-cp ../manifests/ccnp-example-deployment.yaml $TEMP_MANIFEST_FILE
+cp deployment/kubernetes/manifests/ccnp-example-deployment.yaml $TEMP_MANIFEST_FILE
 if [[ -n "$registry" ]]; then
 	sed -i  "s#${DEFAULT_DOCKER_REPO}#${registry}#g" $TEMP_MANIFEST_FILE
 fi
 if [[ -n "$tag" ]];then
 	sed -i "s#${DEFAULT_TAG}#${tag}#g" $TEMP_MANIFEST_FILE
 fi
 
-if [ $DELETE_DEPLOYMENT == true ]
-then
+# Delete old pod if it exists
+OLD_POD_NAME=$(kubectl get po -n ccnp | grep ccnp-example | grep Running | awk '{ print $1 }')
+
+if [[ $DELETE_DEPLOYMENT == true ]] && [[ -n "$OLD_POD_NAME" ]]; then
     echo "==> Cleaning up ccnp-example deployment"
-    kubectl delete -f $TEMP_MANIFEST_FILE
+    kubectl delete deployment ccnp-example -n ccnp
 fi
 
 echo "==> Creating ccnp-example deployment"
 kubectl apply -f $TEMP_MANIFEST_FILE
-for i in {1..5}
+for i in {1..10}
 do
     POD_NAME=$(kubectl get po -n ccnp | grep ccnp-example | grep Running | awk '{ print $1 }')
     if [[ -z "$POD_NAME" ]]
@@ -57,3 +61,5 @@ if [[ -z "$POD_NAME" ]]; then
     exit 1
 fi
 echo "CCNP example pod $POD_NAME is Running."
+
+popd || exit

test/ci-test/ci-e2e-test.sh

@@ -5,11 +5,11 @@
 
 set -o errexit
 
-PY_WORK_DIR='test/ci-test/py-test'
+PY_WORK_DIR='/run/ccnp/ci-test/py-test'
 
 for i in {1..3}
 do
-    POD_NAME=$(kubectl get po | grep ccnp-example | grep Running | awk '{ print $1 }')
+    POD_NAME=$(kubectl get po -n ccnp | grep ccnp-example | grep Running | awk '{ print $1 }')
     if [[ -z "$POD_NAME" ]]
     then
         sleep 2
@@ -27,12 +27,12 @@ fi
 
 # Run python tests
 echo "--------> Run python test........."
-kubectl exec -it "$POD_NAME" -- pytest -v ${PY_WORK_DIR}
+kubectl exec -it "$POD_NAME" -n ccnp -- pytest -v ${PY_WORK_DIR}
 
 # Run go tests
 echo "--------> Run go test........."
-kubectl exec -it "$POD_NAME" -- ./go-sdk-example
+kubectl exec -it "$POD_NAME" -n ccnp -- ./go-sdk-example
 
 # Run rust tests
 echo "--------> Run rust test........."
-kubectl exec -it "$POD_NAME" -- ./rust-sdk-example
+kubectl exec -it "$POD_NAME" -n ccnp -- ./rust-sdk-example