-
Notifications
You must be signed in to change notification settings - Fork 359
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Modify workflows, ci and manifest scripts for split images #5903
Conversation
bde92da
to
80dabe3
Compare
80dabe3
to
26b0b7d
Compare
ci/jenkins/test-vmc.sh
Outdated
copy_image antrea-ubuntu.tar docker.io/antrea/antrea-agent-ubuntu ${IPs[$i]} ${DOCKER_IMG_VERSION} true | ||
copy_image "" docker.io/antrea/antrea-controller-ubuntu ${IPs[$i]} ${DOCKER_IMG_VERSION} false |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I feel it's better to to save the image into different tar files in lines 436-442, and use them correspondingly here.
It's confused to copy an empty image in copy_image
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Why is the line 424 still using antrea-ubuntu:latest
?
sed -i "0,/antrea-ubuntu:latest/{s/antrea-ubuntu:latest/antrea-ubuntu:$DOCKER_IMG_VERSION/}" ${GIT_CHECKOUT_DIR}/build/yamls/$antrea_yml
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I noticed that we also use old Antrea image in this script from line 462. I feel this might be broken after image split. @XinShuYang could you help to estimate? Thanks.
Looks like OLD_ANTREA_VERSION
is only used in {name}-{test_name}-matrix-compatibility-test
job. Maybe we should allow this being broken for this change? @antoninbas @tnqn
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Yes it feels like we may have to address it in the follow up PR.
I think it will only be broken after we release 1.15, and we start testing upgrade from Antrea v1.15 to a later version. At this point we may have to account for the fact that the old version can either be using a unified image or split images.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I noticed that we also use old Antrea image in this script from line 462. I feel this might be broken after image split. @XinShuYang could you help to estimate? Thanks.
Yes, we only pull old image in {name}-{test_name}-matrix-compatibility-test
, I am okay to fix it in a separate PR after 1.15 release.
26b0b7d
to
b6a1730
Compare
b6a1730
to
09a2d93
Compare
09a2d93
to
b679ef2
Compare
b679ef2
to
0e5b82d
Compare
hack/generate-manifest.sh
Outdated
@@ -323,12 +324,14 @@ EOF | |||
fi | |||
|
|||
if [ "$MODE" == "dev" ]; then | |||
if [[ -z "$IMG_NAME" ]]; then | |||
if [[ -z "$AGENT_IMG_NAME" ]] || [[ -z "$CONTROLLER_IMG_NAME" ]]; then |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
If AGENT_IMG_NAME
is set and CONTROLLER_IMG_NAME
is unset, both controllerImage
and agentImage
repository will be hardcoded. Moreover, in this case, if COVERAGE is false, no value will be added to HELM_VALUES. Not sure if this meets you expectation?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
If
AGENT_IMG_NAME
is set andCONTROLLER_IMG_NAME
is unset, bothcontrollerImage
andagentImage
repository will be hardcoded.
Please address this comment.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
yes, in dev mode we will be hardcoding both.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
to me it feels that both images should be handled separately:
if [[ -z "$AGENT_IMG_NAME" ]]; then
# ...
fi
if [[ -z "$CONTROLLER_IMG_NAME" ]]; then
# ...
fi
190e5f6
to
a4155bb
Compare
a4155bb
to
ae798e8
Compare
|
ae798e8
to
78d7c83
Compare
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
LGTM
/test-e2e |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
LGTM
/test-multicluster-e2e |
hack/generate-manifest.sh
Outdated
@@ -323,12 +324,14 @@ EOF | |||
fi | |||
|
|||
if [ "$MODE" == "dev" ]; then | |||
if [[ -z "$IMG_NAME" ]]; then | |||
if [[ -z "$AGENT_IMG_NAME" ]] || [[ -z "$CONTROLLER_IMG_NAME" ]]; then |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
to me it feels that both images should be handled separately:
if [[ -z "$AGENT_IMG_NAME" ]]; then
# ...
fi
if [[ -z "$CONTROLLER_IMG_NAME" ]]; then
# ...
fi
4107a2a
78d7c83
to
4107a2a
Compare
4107a2a
to
b446585
Compare
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
LGTM
@jainpulkit22 please resolve the conflicts, thanks |
b446585
to
387f8b2
Compare
resolved, thanks |
387f8b2
to
c82dc28
Compare
Signed-off-by: Pulkit Jain <jainpu@vmware.com>
c82dc28
to
98f5c94
Compare
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
LGTM
/test-all |
Part of #5691.