| Age | Commit message (Collapse) | Author | Files | Lines |
|---|
|
Packetary automatically solves for Fuel@OPNFV:
- base pkgs and their deps;
- bootstrap/target image additional pkgs;
- explicit reqs;
However, corner cases like "pcs", which is not in any of the
above categories - being installed via puppet only, need to be
added to the explicit list.
NOTE: This enables full offline deploys for simple scenarios
(i.e. without any plugins). Each plugin might need additional
packages, which will be handled in further patches.
See the bug report for more information.
JIRA: FUEL-250
Change-Id: Id1d31c98308cdee6cb935627984188561b560ff4
Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
|
|
Instead of overwriting fuel_bootstrap_cli.yaml during post-install,
with a static config which we need to manually sync in OPNFV after
each upstream change, make the whole thing dynamic by syncing (via
patch) fuel-menu's default settings with OPNFV bootstrap.
This allows us to drop the static fuel_bootstrap_cli.yaml.
JIRA: FUEL-266
Change-Id: I132f2a272c764ad0fc84b3e0e0e1222b1fab1cd2
Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
|
|
Packetary automatically solves for Fuel@OPNFV:
- base pkgs and their deps;
- bootstrap/target image additional pkgs;
- explicit reqs;
However, corner cases like "postfix", which is not in any of the
above categories - being installed via puppet only, need to be
added to the explicit list.
JIRA: FUEL-250
Change-Id: I21f4c295a59426af26035d18be548a39a9e78851
Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
|
|
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>
|
|
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>
|
|
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>
|
|
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: 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>
|
|
Meanwhile we're investigating the issues with Ubuntu repo mirror selection,
we will hardcode the Ubuntu repo mirror
Change-Id: I776bd3a8a72dc87e00052e8ff965de1134293c7a
Signed-off-by: Jonas Bjurel <jonas.bjurel@ericsson.com>
|
|
Whitewash the geographically "close" mirrors against the list of
fully synced mirrors - we've had a few instances of getting bad
mirrors which would break the script.
All credit goes to:
https://askubuntu.com/questions/39922/how-do-you-select-the-fastest-mirror-from-the-command-line
... and we should perhaps use the netselect tool as well somewhere down
the line, but this fixes the most urgent problem.
Change-Id: Ia61a2bd78657b28019f57fc1962d410e754e6d2a
Signed-off-by: Stefan K. Berg <stefan.k.berg@ericsson.com>
|
|
- Added licences and (c) to files not complying to Licence and (c) policies.
- Removed example templates not having correct licence claims and no longer being rellevant.
- Removed the Vagrant deployment method as it is not used, not rebased/up to date and not holding correct license claims.
Strategies used:
- Machine generated are not assigned an licence text, the licence follow from the source.
- Generated patch files are not assigned an licence text, the licence follow from the source.
Change-Id: I9763f076eae51fbb2d4e5cb8cacfa4bb6cf338cc
Signed-off-by: Jonas Bjurel <jonas.bjurel@ericsson.com>
|
|
Rsync protocol was used for creating local mirrors, but now we only need
http connection. This requirement can be problematic for environments
which are behind proxy and can lead to build failures when rsync is not
allowed.
Change-Id: I4efcf500fd0c25de5fdb87307e7210cc4a96714d
Signed-off-by: Michal Skalski <mskalski@mirantis.com>
|
|
Usually UBUNTU_ARCH is not changed inside the same repository,
but we should consider this case anyway for future merging
Armband and Fuel@OPNFV repositories/build systems.
This applies to all Fuel plugins and the local repo.
Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
|
|
stable/mitaka branch is open for new commits for Fuel 9.1. To not be
impacted by new upstream changes point to specific commits which were
used for Fuel 9.0 General Availabilit (9.0.1).
JIRA: https://jira.opnfv.org/browse/FUEL-153
verify: no-cache
Change-Id: I7fd8d2f11e4be6f47e39924913c48bfe7d4f2eb3
Signed-off-by: Michal Skalski <mskalski@mirantis.com>
|
|
Create a new cache of f_repobuild job when list of packages required by
plugins has changed.
JIRA: FUEL-150
Change-Id: I079950eaa9e3b32ea7baa3f6d4a37cc37f99f3a7
Signed-off-by: Michal Skalski <mskalski@mirantis.com>
|
|
Fix is currently in master branch of fuel-mirror, I am not sure when
backport to mitaka branch will be aproved, so for now lets point to
specific commit.
Change-Id: I5215707b477df1b6e8735e62cb392aa1400e8bc2
Signed-off-by: Michal Skalski <mskalski@mirantis.com>
|
|
For Armband, fuel-mirror code needs to be patched outside of the build
system, so we factor out the repo URL into an overrideable variable
(FUEL_MIRROR_URL).
Change-Id: Icf26f1b84f5a653f541819a42980377f51c7f299
Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
Signed-off-by: Stanislaw Kardach <Stanislaw.Kardach@cavium.com>
|
|
Change-Id: I3128652aeb87cb2cfaa91ded1b8d9ebeeb70d33b
Signed-off-by: Michal Skalski <mskalski@mirantis.com>
|
|
Change-Id: Id60f2625c2d84695b86b5b7bce3271babcefde12
Signed-off-by: Stefan Berg <sfb@consultron.com>
|
|
Change-Id: I05cb8dfcf8d8b7cf256c6e6d900f1a90a2b2870e
Signed-off-by: Michal Skalski <mskalski@mirantis.com>
|
|
If FUEL_MIRROR_COMMIT is set (indicating a pinning of all
Fuel repositories), use that one instead of FUEL_MAIN_TAG.
Change-Id: I4af82cf63f8e846d757a583836fce8bb78d93906
Signed-off-by: Stefan K. Berg <stefan.k.berg@ericsson.com>
|
|
It is not necessary to create local mirrors with mos-ubuntu packages for
our purpose. These packages are already included on ISO, we only need
these from ubuntu upstream repositories.
Change-Id: I26d88019981b32e7fdb69a0a608a910bbe4d623a
Signed-off-by: Michal Skalski <mskalski@mirantis.com>
|
|
Please review this carefully!
Strategy:
1) No strict research on copyright/who did what (if you want it changed
contact the Fuel team or Jonas Bjurel)
2) Licence statements will not be added to the following file types:
- Patch files or orig files for patches
- Config files generated by ordinary tools, like libvirt/visrsh
- GIT dierctive file
- Other auto-generated files
Change-Id: I48504c6f27925445dc44683a27a575bcab78d828
Signed-off-by: Jonas Bjurel <jonas.bjurel@ericsson.com>
|
|
Change-Id: Ie7d921b3728df937dc719cd638fa7ae035fc9307
Signed-off-by: Michal Skalski <mskalski@mirantis.com>
|
|
- switch to fuel-mirror [1]
- plugin developers can create packages.yaml
file with names of required packages
- use custom configuration for fuel-bootstrap
which always point to local repositories
- delay process of bootstrap image creation until
mirrors will be ready
[1] https://github.com/openstack/fuel-mirror
Change-Id: Ie4a47c8cc13d9ded8c6b5fe48cdcbfeb1f6277a4
Signed-off-by: Michal Skalski <mskalski@mirantis.com>
|
|
In order to speed up the build process when building with the cache
enabled, cache immediately following the build of a sub artifact
instead of at the end.
Should the build fail, we don't need to rebuild those parts that
already were successful in the last build.
Change-Id: I23b59f7ba4a04272aea855cf451793158fe12241
Signed-off-by: Stefan K. Berg <stefan.k.berg@ericsson.com>
|
|
Add logic to fetch information about last suitable snapshot which can be
used to download ubuntu packages. This is for example use to build
community ISO [1]. This should help in case of snapshot switch [2].
[1]
https://github.com/fuel-infra/jenkins-jobs/blob/master/servers/fuel-ci/8.0/builders/community.all.sh#L36-L40
[2] https://bugs.launchpad.net/fuel/+bug/1493390/comments/9
Change-Id: Id5a8d41278561473ea4844631bfefa0049e64dbc
Signed-off-by: Michal Skalski <mskalski@mirantis.com>
|
|
Including dependencies directly in to plugin binary require maintain list
of direct links to specific versions of system packages, which often
become out of date. This change propose to create requirements-deb.txt file
in plugin build directories which will contain only names of deb packages
needed for successful deployments in offline environments. Based on the
content of these files the common list of dependencies will be created [1].
Defined system packages together with their dependencies will be downloaded
during process of creating partial mirror.
[1] https://docs.mirantis.com/openstack/fuel/fuel-7.0/operations.html#troubleshooting-partial-mirror
verify: no-cache
Change-Id: If40b040fcf062f78af6c453a791b02ebf10e7b85
Signed-off-by: Michal Skalski <mskalski@mirantis.com>
|
|
Restructure of the directory layout due to move of Fuel into it's own repo
JIRA: FUEL-85
Change-Id: I3647e1992a508f29dce06a5d6c790725c527f6f5
Signed-off-by: Jonas Bjurel <jonas.bjurel@ericsson.com>
|
Alexandru Avadanii
Michal Skalski
Stefan K. Berg
Jonas Bjurel
Stefan Berg