This release fixes a bug where UPSTREAM_URL was not substituted in the
yum config, updates the Makefile providing better options, introduces a
travis config for the repo, creates a separate ister statedir for
build-image to not conflict with the system's main statedir, and updates
the package structure to follow regular Go conventions.
Signed-off-by: Tudor Marcu <tudor.marcu@intel.com>
Create a const in the mixer/main.go and let the release target grab
it, instead of keeping the release number in two places.
Signed-off-by: Caio Marcelo de Oliveira Filho <caio.oliveira@intel.com>
When not being called from inside of what looks like a GOPATH, create
a local directory to use as GOPATH. The Makefile now will work
correctly with the generated release tarball.
Also done a few other cleanups in the Makefile.
Signed-off-by: Caio Marcelo de Oliveira Filho <caio.oliveira@intel.com>
This was not set in the codepath where a user does not have a local
rpmdir defined. It must always be substituted else yum will fail because
the URL is incorrect.
Signed-off-by: Tudor Marcu <tudor.marcu@intel.com>
Mixer calls ister, that calls swupd (client), that uses a staging
directory to cache downloaded files. If not specified, it defaults to
the system one, which is not what we want, since the system might not
be using the mix we are creating.
Without passing this, build-image works only if there is no conflict
with some previous version (from any stream) that it used before.
Fix based on diagnostic by Tudor and William.
Signed-off-by: Caio Marcelo de Oliveira Filho <caio.oliveira@intel.com>
Follow the expected Go convention for packages, and put the project
under github.com/clearlinux/mixer-tools with the correct hierarchy.
Simplify Makfile for the time being.
Signed-off-by: Tudor Marcu <tudor.marcu@intel.com>
When building or testing, the existing GOPATH must be preserved for
dependencies to be found outside the project. This allows "go get" to be
used to download dependencies without mixing them with the project
source.
Signed-off-by: Rodrigo Chiossi <rodrigo.chiossi@intel.com>
This release introduces several new features:
- Upstream url and version are saved in the respective
mixver directory to retain history of where content may have come
from.
- Environment variables are now usable in the builder.conf to do things
such as $HOME/mix/update.
- A new command 'add-bundles' is added which handles
copying over upstream bundle definitions into mix-bundles, while resolving
includes and pulling them in automatically.
- Error fixes for handling http get status codes.
Signed-off-by: Tudor Marcu <tudor.marcu@intel.com>
This is not a required file by mixer so it should not exit if it does not
exist. Only print out that we're saving it if we actually passed in an
upstream url on the cmd line.
Signed-off-by: Tudor Marcu <tudor.marcu@intel.com>
Adds support for an '-all' flag to mixer add-bundles.
This flag takes precedence over the list passed with
the '-bundles' flag, and still supports '-force' and
'-git' options.
Note: this commit also passes the '-q' ('--quiet')
flag to git when making a commit, supressing the
potentially long output.
In order to known if there have been format bumps of the
version of ClearLinux this mix is based upon (upstream),
both the source URL and version will be needed.
Signed-off-by: Mark Horn <mark.d.horn@intel.com>
This code change enables the use of Linux Environment
variables in the configuration file. This is very useful
for paths to avoid having to hard-code paths.
Added Environment Variable Checking
For proper use, it will also require a similar patch to
the bundle-chroot-builder project.
See https://github.com/clearlinux/bundle-chroot-builder/pull/12
Signed-off-by: Mark Horn <mark.d.horn@intel.com>
Also change the caller code to show what error happened: useful to
distinguish 404 from timeouts. The PrintErrors were removed, since
they were leading to duplicated errors in the output, letting the
caller print the error message is enough.
This fixes the issue of writing invalid files (without error) if the
.clearversion do not exist. The contents would have the actual error
code.
Signed-off-by: Caio Marcelo de Oliveira Filho <caio.oliveira@intel.com>
build-image wants a builder.conf file, but the -config option was
missing from this command.
build-image assumed the template file was a hard coded name; added
functionality to pass through with new -template argument.
Signed-off-by: Mark Horn <mark.d.horn@intel.com>
Adds new "mixer add-bundles" command to automate the
addition of bundles to the mix-bundles/ directory.
Currently, adding bundles to your mix means copying
them manually from the pulled
clear-bundles/clear-bundles-<VER>/bundles/ dir to your
mix-bundles/ dir. This is a manual process, and thus
following bundle dependencies (i.e., “include
(other-bundle)”) is a manual process.
This new command parses the requested bundle definitions
and recursively copies bundles into your mix dir. Skips
(with warning) by default if present, or overwrites with
optional "-force" flag. Also optionally auto git commits
new bundle addition with "-git" flag.
Signed-off-by: Kevin C. Wells <kevin.c.wells@intel.com>
This release adds fixes to remove unsuccessful curl download files,
merges the git helper functions into a generic one to use for all future
git commands, and rewrites the cmd-line code to a more maintainable and
extensible implementation.
Signed-off-by: Tudor Marcu <tudor.marcu@intel.com>
Changed it to be a function in main.go instead of a method since it
wasn't using anything related to the Builder struct.
Minor tweaks to make code more idiomatic: avoid i for the non-index
variable in range, return an error instead of printing the error and
boolean.
Signed-off-by: Caio Marcelo de Oliveira Filho <caio.oliveira@intel.com>
The method (and use of reflect package) is unnecessary when we are
using a literal string as argument.
Signed-off-by: Caio Marcelo de Oliveira Filho <caio.oliveira@intel.com>
Instead of having the flag specification, flag parsing, and command
processing in three different parts of the main function, move the
whole code for each command to its own function.
This patch also fixes the issue that build-all was always using the
default values of the flags, since the build-update specific flags
were not being added to its FlagSet. The problem was hard to see
because all commands shared the same scope.
Signed-off-by: Caio Marcelo de Oliveira Filho <caio.oliveira@intel.com>
And also dump the Stderr of the command to os.Stderr. Without a git
failure might not give enough information about what gone wrong,
e.g. when trying to call "git commit" without a user.email configured.
The commit message was changed to include the Clear version from which
the Mix was based off.
Signed-off-by: Caio Marcelo de Oliveira Filho <caio.oliveira@intel.com>
Only create the file if the HTTP connection succeeds, and in case of
failure later on during download, remove the partial file.
This let the user retries the operation, otherwise the empty/partial
file will prevent the download. One of such cases is forgetting to set
the https_proxy.
Signed-off-by: Caio Marcelo de Oliveira Filho <caio.oliveira@intel.com>
This release fixes mixer to use absolute path for certificates so that
it can be run from different directories other than the workspace.
Signed-off-by: Tudor Marcu <tudor.marcu@intel.com>
This release updates the name of the release tarball to 'mixer-tools',
and adds better validation to the version file reading.
Signed-off-by: Tudor Marcu <tudor.marcu@intel.com>
This release changes add-rpms to hardlink instead of copy if possible,
speeding up the operation when there are many local rpms, and falls back to
a regular copy if hardlinking fails.
Signed-off-by: Tudor Marcu <tudor.marcu@intel.com>
This release fixes a bug for compatibility with the swupd-client v3.8.3
release; the /usr/share/clear/update-ca directory must now be manually
created in the os-core-update bundle before installing the certificate.
Signed-off-by: Patrick McCarty <patrick.mccarty@intel.com>
Starting with swupd-client v3.8.3, the update-ca directory is no longer
created for the build, so the cert copy is failing. Fix the issue by
creating the directory before the copy operation.
Signed-off-by: Patrick McCarty <patrick.mccarty@intel.com>
This release enables the build-all option which will generate all content
for a mix; this means: chroots, all update content (manifests, packs, etc),
and auto-increments the mixversion number so it can be run consecutively
without any user intervention between mixes.
Signed-off-by: Tudor Marcu <tudor.marcu@intel.com>
The tools have been converted from many bash scripts into a single binary,
written in Go. This creates a codebase that is much easier to edit and
maintain, and a single tool that provides all the functionality needed. The
interface is more intuitive and easy to use as it provides options and menus
for each subcommand.
Signed-off-by: Tudor Marcu <tudor.marcu@intel.com>
Because Clear version numbers use numeric digits only, it's possible for
the tag names to conflict with the prefix of a git object hash in the
repo. To remove the possibility of conflict, use the refs/tags/ prefix
when querying the tag names.
Signed-off-by: Patrick McCarty <patrick.mccarty@intel.com>
With the current workflow, the "mix-bundles" repo is used for
mix-specific bundle changes, and the "clr-bundles" repo is treated as
read-only.
So in clr-bundles, the CLRVER_mix branches should always point to the
commit tagged with CLRVER. To make this handling more robust, first
verify that CLRVER exists and is a tag. Then create the CLRVER_mix
branch based on CLRVER, or if the branch already exists, reset it
appropriately.
Since this is the best place to detect invalid CLEAR_VERSION numbers
passed in the builder.conf, I've added that error handling too.
Signed-off-by: Patrick McCarty <patrick.mccarty@intel.com>
Tudor Marcu