Skip to content
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.

Sign up for GitHub

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

Jump to bottom

[JUJU-808] Fix build official build #13886

Merged
merged 4 commits into from
Mar 28, 2022
Merged

[JUJU-808] Fix build official build #13886

merged 4 commits into from
Mar 28, 2022

Conversation

ycliuhw
Copy link
Member

@ycliuhw ycliuhw commented Mar 25, 2022 •
edited
Loading

The Current.Build and OfficialBuild numbers are confusing and break CaaS models running on an IaaS on our CI tests.
This PR ensures

  1. we can only set either Current.Build or OfficialBuild;
  2. Current.Build is the build number we need to check(OfficialBuild is only used for version.go internally);
  3. We set the version with build number for CaaS models now which fixes a bug that facades and workers running on controller for CaaS models wrongly use the controller's builder number;

TODO:
I will need to change our CaaS CI tests and edge build Jenkins jobs for this build number logic change.

Checklist

  • Requires a pylibjuju change
  • Added integration tests for the PR
  • Added or updated doc.go related to packages changed
  • Comments answer the question of why design decisions were made

QA steps

$ JUJU_BUILD_NUMBER=889 make install

$ JUJU_BUILD_NUMBER=889 DOCKER_USERNAME=ycliuhw make push-release-operator-image

$ juju bootstrap microk8s k1

$ juju add-model t1

$ juju deploy hello-kubecon

$ juju deploy cs:~juju/mariadb-k8s-3

$ JUJU_BUILD_NUMBER=999 DOCKER_USERNAME=ycliuhw make push-release-operator-image

$ juju upgrade-controller --agent-stream=develop

$ juju upgrade-model --agent-stream=develop


# gcloud create a gke cluster

$ JUJU_BUILD_NUMBER=1 DOCKER_USERNAME=ycliuhw make push-release-operator-image

$ juju bootstrap aws/ap-southeast-2 k2 --show-log

$ juju add-k8s --gke gke --debug -c k2

$ juju add-model t1 gke

$ juju deploy hello-kubecon

$ juju deploy cs:~juju/mariadb-k8s-3

$ juju upgrade-controller --agent-stream=develop --build-agent

$ JUJU_BUILD_NUMBER=2 DOCKER_USERNAME=ycliuhw make push-release-operator-image

$ juju upgrade-model --agent-stream=develop

Documentation changes

No

Bug reference

No

@ycliuhw ycliuhw changed the title Fix build official build [JUJU-808] Fix build official build Mar 25, 2022
@ycliuhw ycliuhw requested a review from wallyworld March 25, 2022 08:37
wallyworld
wallyworld approved these changes Mar 25, 2022
View reviewed changes
Copy link
Member

@wallyworld wallyworld left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This is great, thanks for fixing

apiserver/facades/controller/caasunitprovisioner/provisioner.go Outdated Show resolved Hide resolved
cloudconfig/podcfg/image.go Outdated Show resolved Hide resolved
@ycliuhw
Copy link
Member Author

ycliuhw commented Mar 28, 2022

$$merge$$

@jujubot jujubot merged commit c14d131 into juju:2.9 Mar 28, 2022
@SimonRichardson SimonRichardson mentioned this pull request Mar 30, 2022
Merged
jujubot added a commit that referenced this pull request Mar 30, 2022
@jujubot
Merge pull request #13897 from SimonRichardson/2.9-develop
55ba9b7 
#13897

- #13891 from hmlanigan/lxd-profile-watcher-regression
- #13850 from jack-w-shaw/JUJU-416_Consolidate_retries_worker_tests_1
- #13871 from arnodel/juju-810-simpleconnector-support-for-ha-controllers
- #13843 from jack-w-shaw/JUJU-416_Consolidate_retries_worker_upgradedatabase
- #13842 from jack-w-shaw/JUJU-416_Consolidate_retries_worker_peergrouper
- #13866 from arnodel/juju-803-move-connector-implementations
- #13893 from ycliuhw/allow-OfficialBuild-Build-coexist
- #13883 from barrettj12/deploy-revision-err
- #13886 from ycliuhw/Fix-Build-OfficialBuild
- #13873 from arnodel/juju-812-remove-connection-reboot-method
- #13878 from arnodel/juju-819-remove-connection-client-method
- #13875 from arnodel/juju-814-remove-connection-unitassigner-method
- #13874 from arnodel/juju-813-remove-connection-instancepoller-method
- #13885 from benhoyt/model-defaults-test-bash
- #13856 from naveensrinivasan/naveen/feat/pin-deps
- #13881 from barrettj12/refresh-local-origin2
- #13882 from benhoyt/tweak-assess
- #13834 from wallyworld/leader-settings-dying
- #13870 from wallyworld/model-default-coerce
- #13869 from arnodel/juju-806-remove-connection-uniter-method
- #13852 from hmlanigan/charm-resources-regression
- #13872 from arnodel/juju-811-remove-connection-upgrader-method
- #13863 from SimonRichardson/charmhub-proxy-middleware
- #13865 from hmlanigan/bootstrap-help-update
- #13855 from SimonRichardson/hide-debug-stack
- #13862 from wallyworld/azure-instance-refresh
- #13755 from jack-w-shaw/JUJU-422_Drop_Space.Subnets-2
- #13860 from jack-w-shaw/fix_shfmt_failure

Usual conflicts.

CONFLICT (content): Merge conflict in worker/caasunitprovisioner/worker_test.go
CONFLICT (content): Merge conflict in worker/caasoperatorprovisioner/worker_test.go
CONFLICT (content): Merge conflict in worker/caasfirewaller/worker_test.go
CONFLICT (content): Merge conflict in cmd/juju/machine/remove.go
CONFLICT (content): Merge conflict in cmd/juju/application/refresh.go
CONFLICT (content): Merge conflict in cloudconfig/podcfg/podcfg_test.go
CONFLICT (content): Merge conflict in caas/kubernetes/provider/bootstrap_test.go
CONFLICT (content): Merge conflict in apiserver/facades/client/client/client_test.go
CONFLICT (content): Merge conflict in apiserver/facades/client/charms/services/repofactory.go
CONFLICT (modify/delete): apiserver/facades/client/charmhub/charmhub.go deleted in HEAD and modified in 2.9. Version 2.9 of apiserver/facades/client/charmhub/charmhub.go left in tree.
CONFLICT (content): Merge conflict in apiserver/facades/client/application/application_test.go
CONFLICT (content): Merge conflict in api/agent/uniter/uniter.go


## QA steps

Tests pass.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@wallyworld wallyworld wallyworld approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@ycliuhw @wallyworld @jujubot