Age | Commit message (Collapse) | Author | Files | Lines |
|
Packetary [1] will replace fuel-mirror in upstream Fuel.
fuel-mirror is using packetary under the hood already, so the
transition should not be too hard.
Adapt OPNFV Ubuntu partial mirror build:
- obsolete opnfv-config.yaml (packetary uses CLI args for this);
- new opnfv_config.yaml will hold old ubuntu.yaml data, split at
build runtime into:
* mos_<arch>_mirror.yaml - MOS mirror cfg, only for deps analysis;
* ubuntu_<arch>_mirror.yaml - Ubuntu mirror cfg, for pkgs download;
* ubuntu_<arch>_packages.yaml - Ubuntu packages to download;
While the consumers of our mirror still use `debootstrap`, which only
supports the "main" repo component, make sure the "main" package set
is complete, in the scope of:
* ubuntu_<arch>_mirror_main.yaml - Ubuntu [main only] mirror;
* ubuntu_<arch>_packages_main.yaml - Ubuntu packages for [main];
New workflow (executed for EACH architecture):
1. Collect bootstrap package deps from <fuel_bootstrap_cli.yaml>;
2. Collect all fixture release pkgs from fuel-web's <openstack.yaml>;
3. Add OPNFV extra pkg deps from "opnfv_config.yaml"
(based on old fuel-mirror)
Currently, this is based on old fuel-mirror's
<fuel-mirror/contrib/fuel_mirror/data/ubuntu.yaml>, holding a
hardcoded list of package deps; plus eventual extra OPNFV packages,
like additional kernels, bootloaders etc.
Since we now inspect MOS repos for deps with packetary, this old
list should be easy to throw away as soon as we confirm each item
is directly required by another, already existing package in the
mirror. For now, keep the old list as safety net for missing deps.
NOTE: Dependencies up to and including this group should also
be satisfiable from Ubuntu "main" repo component only.
4. Append plugin dependencies to the package list;
5. Run `packetary unresolved` for MOS repos, gathering MOS deps that
should be fetched from Ubuntu. The new packages will be appended
to the predefined list from old "ubuntu.yaml";
6. Run `packetary clone` to download all required pkgs for the
partial Ubuntu mirror.
7. IF repo component merging is disabled, run `packetary clone` only
on Ubuntu[main] repo components to download any (still) missing
dependencies for `debootstrap`, which only looks at this component,
and not the whole mirror.
8. IF repo component merging is enabled, run first `dpkg-scanpackages`
to filter out old duplicate versions of packages, then run
`packetary create` to merge all repo comps into a single "main".
v1 -> v2:
- multiarch support (activated via UBUNTU_ARCH envvar);
- fixed debootstrap missing deps in "main" component of Ubuntu mirror;
- factored out some hardcodes into variables/functions;
- add .gitignore file;
- move generated config files to "opnfv_config" subdir;
- add arm64 Ubuntu repo URL (ports.ubuntu.com is separated from the
main Ubuntu mirror, archive.ubuntu.com, which only holds x86 pkgs);
v3 -> v4:
- introduce env var "MIRROR_UBUNTU_MERGE" to control local mirror
repo-component merging into a single "main";
- enable mirror repo-component merging by default, edit
fuel_bootstrap_cli.yaml accordingly;
v4 -> v6:
- edit dea_base to use only main mirror;
- fix duplicated logs;
- remove `-q` flag for `create`;
v6 -> v7:
- rebase for Newton fuel_bootstrap_cli.yaml (s/trusty/xenial/);
- include OPNFV plugin deps in local Ubuntu mirror;
- add `vgabios` dependency, required for arm64 guest firmware;
- remove all fuel-mirror references;
- merge old fuel-mirror pkglist to OPNFV pkglist;
- update packetary commit to include upstream bugfixes [2, 3];
v7 -> v11:
- re-enable f_repobuild after Newton rebase;
- fix leftover "trusty" ref to "xenial";
- force f_repobuild rebuild to bypass cache (by editing Makefile);
- extend f_repobuild .cacheid to include scripts and OPNFV config;
v11 -> v12:
- fix install/install.sh old refs to "trusty";
- fix out of date select_ubuntu_repo.s refs to "trusty";
v12 -> v16:
- fix leftover mos9.0 / fuel-mirror references;
- fix most issues reported by `pylint opnfv_mirror_ubuntu.py`;
v16 -> v18:
- Sync fuel_bootstrap_cli.yaml with settings.yaml.sample from 10.0:
[4] Stub pass for "Get root password for build image from settings"
[5] Sync pkg list with "Switch to Ubuntu Xenial"
[6] "Add puppet and daemonize to default packages list"
[7] "Delete kernel debug related parameter for performance"
[8] "Add to bootstrap image dependencies for network checker"
- Remove obsolete Trusty kernel images from pkg lists;
- Don't break when plugins set is empty;
- Fix missing "vim" package, which was resolved using secondary
provider packages like GUI-enabled vim flavors;
The proposed fix is quite sensitive, also cutting the final
mirror size in half (!), and allowing us to remove a previous
hacky workaround (re-running packetary only for main).
- Remove "main"-only packetary run (hacky), since the new fix for "vim"
also takes care of packetary solving dependencies from "universe".
- Add OPNFV blacklisting to workaround "upstart" package being installed,
together with "systemd" (having them both installed confuses puppet);
- Currently in testing in Armband as part of [9]:
* bootstrap and target image building works from offline mirror;
* systemd is used instead of upstart;
* full deploy is not yet confirmed, due to some AArch64 specifics we
are in the process of fixing;
NOTE: Without filtering out old package verisons using
`dpkg-scanpackages`, bootstrap build cannot solve all deps.
FIXME: Repo component merging is sort of slow, since packetary insists
on copying the source files to the destination dir even if they are
pointing to the same repo.
FIXME: Packetary `create` uses a different directory scheme for the
created mirror than the upstream Ubuntu, e.g.:
[p] mirrors/ubuntu/pool/main/l/lvm2_2.02.98-6ubuntu2_amd64.deb
[U] mirrors/ubuntu/pool/main/l/lvm2/lvm2_2.02.98-6ubuntu2_amd64.deb
This disencourages creating the "merged" mirror in the same location
as the source partial mirror.
[1] https://wiki.openstack.org/wiki/Packetary
[2] https://review.openstack.org/#/c/392936/
[3] https://review.openstack.org/#/c/392937/
[4] https://review.openstack.org/#/c/277353/
[5] https://review.openstack.org/#/c/345516/
[6] https://review.openstack.org/#/c/344909/
[7] https://review.openstack.org/#/c/400165/
[8] https://review.openstack.org/#/c/415912/
[9] https://gerrit.opnfv.org/gerrit/#/c/26157/
[10] https://review.openstack.org/#/c/420815
JIRA: FUEL-218
JIRA: FUEL-223
JIRA: ARMBAND-169
JIRA: ARMBAND-185
Change-Id: If2ee86f348b7683c83bfaf686baba4f1b8f555f0
Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
|
|
Change-Id: I370f454880914b78609e0a8f778de4bee93a8553
Signed-off-by: Michael Polenchuk <mpolenchuk@mirantis.com>
|
|
JIRA: FUEL-230
Change-Id: I315a9ed955cafa68a2454c30daac9dbf41f76e05
Signed-off-by: Fedor Zhadaev <fzhadaev@mirantis.com>
|
|
|
|
1. rebase to latest ovs without NSH
2. rebase to ovs 2.6.1 with NSH
Change-Id: I5481422e55fc65f48b78b4779119d9ff19868a91
Signed-off-by: Guo Ruijing <ruijing.guo@intel.com>
|
|
Fix installation dependency and authentication failure.
Change-Id: Ib15ecccaefd1e0214edd2e1d1f52ab3f9ed99f3a
Signed-off-by: Edwin Zhai <edwin.zhai@intel.com>
|
|
|
|
1. ceilometer collectd basic functionality can work
2. will update config.mk after review #26213 is merged
Change-Id: I3a115f20b176dbee93ce5d72c580c83d6b721382
Signed-off-by: Guo Ruijing <ruijing.guo@intel.com>
|
|
Newton uplift [1] silently disabled env var overrides for the
PLUGINS var, breaking Armband plugin selection.
Proposed fix: only set this var when not already set.
[1] https://gerrit.opnfv.org/gerrit/#/c/23433/
JIRA: ARMBAND-118
Change-Id: I143fc79de26cc9a3b66a177ca905984989bf4a9d
Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
|
|
JIRA: FUEL-227
Change-Id: I9186a1b0e0ef86c2efa322805c302f02c832e10f
Signed-off-by: Michael Polenchuk <mpolenchuk@mirantis.com>
|
|
|
|
Change-Id: Ie9efd6a01b483e3e0797c19708cd1ca793f609d6
Signed-off-by: Guo Ruijing <ruijing.guo@intel.com>
|
|
Stop ISO build process if no sane Ubuntu mirrors are available,
instead of continuing with an empty URL, which is bound to fail
later.
While at it, skip re-assesing the output of select_ubuntu_repo.sh if
the URL var already is set.
Also, stderr and stdout were both captured in UBUNTU_MIRROR_URL,
so disable debug by default, and only print debug info in case no
valid mirror is found.
v2 -> v3:
- allow "One hour behind" mirror state to be considered, since
we already accept "Six hours behind" mirrors;
JIRA: FUEL-240
Change-Id: I791942da234304528ff5cae1891415602e1a62b2
Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
|
|
JIRA: FUEL-227
Change-Id: Ia18064299da7c056cb247c2f7f350e5532f2f587
Signed-off-by: Michael Polenchuk <mpolenchuk@mirantis.com>
|
|
|
|
In the middle of fuel master node bootstrap the reload of sshd service
accidentally is losing main process pid, so restart it.
JIRA: FUEL-237
Change-Id: I89023177e71cb6da4b9d6beff5083d345cf66db8
Signed-off-by: Michael Polenchuk <mpolenchuk@mirantis.com>
|
|
JIRA: ARMBAND-183
Change-Id: Ie43f8f9080241add1cb9d5312c774916baee0bee
Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
|
|
|
|
Since swarm tests have been enabled against 10.0
so get the latest repositories into build.
Change-Id: Ie24e51dbc2e80ef61dd9d892cd0083a594fd289e
Signed-off-by: Michael Polenchuk <mpolenchuk@mirantis.com>
|
|
Change-Id: I7c46f263ec584b09b6022d9e961ae3c44c642954
Signed-off-by: Michael Polenchuk <mpolenchuk@mirantis.com>
|
|
Change-Id: Ibb5ed6a6d5dfb206388257367a66f5d758b2da9f
Signed-off-by: Guo Ruijing <ruijing.guo@intel.com>
|
|
Fix two issues that went undetected until now:
- remote tracking variable does not properly evaluate in CI,
since there is no HEAD reference;
- git submodules references still point to master branch(es)
commits, although .gitmodules configure the remote tracked
branch correctly;
JIRA: FUEL-234
Change-Id: I96dc704e2cfe98f2e93d5fa7d7dd261e7f151238
Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
|
|
JIRA: FUEL-234
Change-Id: I916cc94f58df2f2227384c73eda556f448ac50b5
Signed-off-by: Michael Polenchuk <mpolenchuk@mirantis.com>
|
|
The ovs-plugin has been rebased to fuel 10/newton.
Change-Id: I23d9f33b005ec139862e4a53b70987706ae98198
Signed-off-by: Michael Polenchuk <mpolenchuk@mirantis.com>
|
|
Build working, automated deploy working (simple test cases only).
All plugins disabled, so is the generation of the local ISO cache.
Both need to be re-enabled after merge of this uplift.
All patches wiped, pertinent ones need to be re-enabled after the
merge of this uplift.
Change-Id: I978a3d4ed25a45a4b88a6e35693baac597b162c2
Signed-off-by: Stefan K. Berg <stefan.k.berg@ericsson.com>
|
|
Split out public_vip_ping task to avoid race condition when ping_checker
resource might be started up on controllers before a primary one.
JIRA: FUEL-217
Change-Id: I3c11e8403d4e1c53a7f0eac07c71f59584882332
Signed-off-by: Michael Polenchuk <mpolenchuk@mirantis.com>
|
|
Avoid public vip failover at the end of post-deployment
by moving ping_checker resource into deployment stage.
Also pingd constraint has been changed to be based on score.
If all the nodes failed to ping the default gw, the resource
ain't stopped and remains on the last node where it was.
JIRA: FUEL-212
JIRA: FUEL-217
Change-Id: I09329474cf13958499ac99bfbdf9c9055c9bcb55
Signed-off-by: Michael Polenchuk <mpolenchuk@mirantis.com>
|
|
|
|
JIRA: FUEL-212
Change-Id: Ie8c50d515bffbb39deb44c32da42079b4181edd3
Signed-off-by: Michael Polenchuk <mpolenchuk@mirantis.com>
|
|
|
|
Repoint to the "Update flavors mem_page_size"
from stable/9.0 branch of plugin.
Change-Id: I91d6a770faa9ee2d078b7f1ccccb7d61525ad923
Signed-off-by: Michael Polenchuk <mpolenchuk@mirantis.com>
|
|
To properly handle source routing passing by dhcpd
inside instance get latest cirros image.
JIRA: FUEL-202
Change-Id: Icd44ebbdd7b4aa0cb55c080e614616a7b0198c0f
Signed-off-by: Michael Polenchuk <mpolenchuk@mirantis.com>
|
|
JIRA: FUEL-212
Change-Id: I1c5b8fe123406f1a96c5432d91a9ee5806c7cf62
Signed-off-by: Michael Polenchuk <mpolenchuk@mirantis.com>
|
|
|
|
Fuel 9.1 was released, it is a first time when new version of Fuel is
distributed through the same repositories as previous one, point to
specific snaphost of mos ubuntu repo to prevent mixing packages.
Change-Id: I64bb52657ce476b0c1fdc8e858231ad751ba12b1
Signed-off-by: Michal Skalski <mskalski@mirantis.com>
|
|
|
|
|
|
|
|
|
|
After Armband rework landed of top of `build/f_repos` mechanism [1],
the following minor UX improvements can also be applied to Fuel's
f_repos:
- set SHELL to "/bin/sh" (we don't use any bash-isms);
- improve "From SHA..." removal for exported patches;
- force checkout of root tag commit during clean;
- silence progress during git clone (cleaner logs);
- support git older than 1.8.4 in `make clean` (fix Armband deploy);
FIXME:
Pass TERM as Docker env var until [2] is fixed in Docker 1.13.
v4 -> v5:
* Moved `export TERM` to Releng, where it actually belongs [3];
* Fixed Armband deploys fail [4] by adjusting `make clean`;
[1] https://gerrit.opnfv.org/gerrit/#/c/22791/
[2] https://github.com/docker/docker/issues/9299
[3] https://gerrit.opnfv.org/gerrit/#/c/22933/
[4] https://build.opnfv.org/ci/view/armband/job/\
fuel-deploy-armband-baremetal-daily-master/57/consoleText
Fixes: FUEL-200
Change-Id: I80e3074f8659769e21f5b56f07c34c7a5de727bc
Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
|
|
ODL Boron will be used in all scenarios except bgpvpn beacuse vpnservice
was removed in this release, we still will use Beryllium for this
scenario.
This change only replace Beryllium with Boron, it does not use any new
features like odl-netvirt-openstack.
Change-Id: I95264cc97f5b9e922ab3fb7dc024724d9fb83e9c
Signed-off-by: Michal Skalski <mskalski@mirantis.com>
|
|
Some mirrors are misbehaving, for instance due to flood protection,
which makes them unreliable. This change re-introduces the possibility
to blacklist them locally.
Change-Id: I7840ac0a622f2997395e54911685f9eea393dee4
Signed-off-by: Stefan K. Berg <stefan.k.berg@ericsson.com>
|
|
Change-Id: I3ee9e5afa416af9e6a90b77f03ed9258c6bd4b1b
Signed-off-by: Guo Ruijing <ruijing.guo@intel.com>
|
|
|
|
ArmbandFuel@OPNFV uses Fuel@OPNFV git repo as a submodule, so
its .git dir is located outside work tree root (F_GIT_ROOT).
Allow this setup by parsing `git rev-parse --git-dir` intead of
harcoding git dir path.
Fixes: FUEL-200
Change-Id: Ia7f3b23e9333356fe05b9ed0565218f2c7ec8eba
Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
|
|
isoinfo -i lists the following information for Fuel@OPNFV ISO:
"Data preparer id: 86aafaf5454a846c417848bb94f264c4420160f3"
where the SHA hash is Fuel git repo HEAD SHA.
For Armband's build system, using only the Fuel commit ID is not
enough to fully describe the state of the source code, as patches
are also applied to other fuel modules (as git submodules).
Instead, a pointer to a valid Armband commit ID should be used.
However, Armband overrides OPNFV_GIT_SHA to the Armband git repo
commit hash, so the ISO metadata should also reflect this.
While at it, allow product name to be overriden, to signal the
commit ID should be looked up inside the Armband repository.
Change-Id: I33ad490f1afe28c1d439dda40e39cee1955e0ac2
Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
|
|
Change-Id: If0f5b268848439aa9d2abee099bbd985abd53d5c
Signed-off-by: Stefan K. Berg <stefan.k.berg@ericsson.com>
|
|
|
|
This change reworks support for cloning (fetching) and patching all
Fuel components (fuel-library ... fuel-ui, see [1] for full list),
both outside the ISO build process (for development purposes, like
testing OPNFV patches apply cleanly to each component), and during
the ISO build.
The implementation relies heavily on git submodules and patches,
so backporting pending upstream gerrit changes, as well as adding new
out-of-upstream-tree patches, should be trivial.
Also, since without tracking remotes the repos rarely change, leverage
the in-place OPNFV build caching mechanism to drastically reduce the
number of git clones during each build.
The mechanism is detailed more in-depth in the JIRA ticket [3], and
it's merely a rehash of the submodule handling in Armband, implemented
initially by Stanislaw Kardach <stanislaw.kardach@cavium.com>.
Pros (+ new features):
- OPNFV patches for Fuel components can be applied (imported) or
developed (exported) outside of the ISO build process;
- git repo caching reduces the number of external pulls;
- reuse the same fuel-* componets in ALL targets
e.g. fuel-mirror used to employ 2 slightly different git trees;
- one step closer to Fuel/Armband merge (lots of steps left though);
Cons:
- adds a lot complexity to solve a non-problem (handling the repos
is fine in the current form, for the current goals);
However, patching <fuel-astute> or <fuel-agent> seems to be
quite complicated with the current mechanism, as env vars
override our locally patched repos for these components).
The proposed change should eliminate this issue completely.
CHANGE:
Aligned divergent fuel-mirror in ISO vs local repo build by
applying the 302 redirect fix ("Fixed handling http redirects") [2]
on top of 9.0.1 tag in fuel-mirror repo, and using that for both.
This obsoleted the followking mk file:
- build/f_isoroot/f_repobuild/config.mk
CHANGE:
Removed unused make target `get-fuel-repo` from build/config.mk.
FIXME:
Remote tracking is currently deactivated for all branches.
Change this when remote HEAD should be tracked instead,
e.g. during Newton rebase.
[1] https://github.com/openstack/fuel-main/blob/stable/mitaka/repos.mk#L32
[2] https://review.openstack.org/#/c/334882/
[3] https://jira.opnfv.org/browse/FUEL-200
TODO: Extend build/f_repos/README.md with info about:
- branch changes;
- tag bumps;
- patching now supports subdirs;
v5 -> v6:
* Added support for nesting patches in subdirs, to be used for feature
groups and related changes across submodules.
E.g. Upcoming multiarch EFI support could go in:
- .../f_repos/patch/fuel-agent/multiarch-efi/...;
- .../f_repos/patch/fuel-astute/multiarch-efi/...;
While Armband patches could go in:
- .../f_repos/patch/fuel-agent/armband/...;
- .../f_repos/patch/fuel-astute/armband/...;
etc.
v6 -> v13:
* fix wrong tag used for VERSION dump;
* fix wrong tag used for patches-export;
* move OPNFV_TAG to main config.mk and use it in FUEL_*_COMMIT;
* only run `patches-import` when patches changed / not yet applied;
* only run `clean` for stale `.cacheid` (avoid re-applying patches);
* allow git submodule path/name to be different (FIXED);
* put-cache should only run when artifact is not already cached;
* `git am`: use 3-way merge so already applied patches are gently
skipped (useful for upstreaming patches from Armband);
* Properly support nested patch dirs;
* Colorize the output a little;
JIRA: FUEL-200
Change-Id: I9dbdd9b3022896d4497d21be8dacc859730db489
Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
|
|
The previous change adding support for OPNFV build tag reuse
added the get/put-cache functionality to `build/docker` just
for detecting env var changes between tag creation and current build.
Obviously, when building outside CI, it is up to the end user to
force a docker rebuild when env vars change (this was the behavior
before the tag reuse support too).
An alternative approach would be removing get/put-cache completely,
if we consider the env vars (http proxy related) never change for
CI cached builds (seems to be true, worst case we wait 1 day for
the tag to expire when it happens).
This change just fixes the original intended behavior in tag reuse.
JIRA: FUEL-204
Change-Id: I14666994bc334012a5198a64a4a24cd4962e4bd6
Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
|