Skip to content

Commit

Permalink
Change antrea image to match the used image
Browse files Browse the repository at this point in the history
This patch change the antrea.yml image to match the built image.
This is needed because the latest antrea.yml uses different image
than the image name that was used when scripting the CI.
  • Loading branch information
abdallahyas committed Apr 14, 2021
1 parent da274ec commit bd7bafb
Showing 1 changed file with 7 additions and 3 deletions.
10 changes: 7 additions & 3 deletions sriov_antrea/sriov_antrea_ci_start.sh
Original file line number Diff line number Diff line change
Expand Up @@ -75,9 +75,13 @@ EOF
if [[ -z "${ANTREA_CNI_PR}${ANTREA_CNI_BRANCH}" ]];then
change_image_name $ANTREA_CNI_HARBOR_IMAGE antrea/antrea-ubuntu
fi


cp $WORKSPACE/antrea-cni/build/yamls/antrea.yml $ARTIFACTS

sed "s;\(^ *image\:\).*;\1 antrea/antrea-ubuntu;" $ARTIFACTS/antrea.yml

if [[ -z "$(grep hw-offload $WORKSPACE/antrea-cni/build/yamls/antrea.yml)" ]];then
sed -i '/start_ovs/a\ - --hw-offload' $WORKSPACE/antrea-cni/build/yamls/antrea.yml
sed -i '/start_ovs/a\ - --hw-offload' $ARTIFACTS/antrea.yml
fi

cat > $ARTIFACTS/antrea-crd.yaml <<EOF
Expand Down Expand Up @@ -164,7 +168,7 @@ kubectl create -f $ARTIFACTS/configMap.yaml
kubectl create -f $(ls -l $WORKSPACE/sriov-network-device-plugin/deployments/*/sriovdp-daemonset.yaml|tail -n1|awk '{print $NF}')


kubectl create -f $WORKSPACE/antrea-cni/build/yamls/antrea.yml
kubectl create -f $ARTIFACTS/antrea.yml

cp $ARTIFACTS/antrea-crd.yaml $(ls -l $WORKSPACE/sriov-network-device-plugin/deployments/*/sriovdp-daemonset.yaml|tail -n1|awk '{print $NF}') $ARTIFACTS/
screen -S multus_sriovdp -d -m $WORKSPACE/sriov-network-device-plugin/build/sriovdp -logtostderr 10 2>&1|tee > $LOGDIR/sriovdp.log
Expand Down

0 comments on commit bd7bafb

Please sign in to comment.