-
Notifications
You must be signed in to change notification settings - Fork 11
Introduce ovirt-engine-repositories role #1
Conversation
@mwperina @machacekondra Just moved all files from other repo, and added the rpm related scripts (just copied the from vm-infra making changes where necessary)/ |
Also can somebody with appropriate permissions enable the Travis CI for this repository? |
ci build please |
I've setup everything. Also in engine-setup repo. CI will start to work, once this patch is merged: |
@machacekondra Super, thanks! |
build.sh
Outdated
@@ -0,0 +1,53 @@ | |||
#!/bin/bash | |||
|
|||
VERSION="1.0.0" |
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.
VERSION="1.1.0"
build.sh
Outdated
#!/bin/bash | ||
|
||
VERSION="1.0.0" | ||
MILESTONE= |
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.
MILESTONE=master
build.sh
Outdated
|
||
VERSION="1.0.0" | ||
MILESTONE= | ||
RPM_RELEASE="1" |
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.
RPM_RELEASE="0.1.$MILESTONE.$(date -u +%Y%m%d%H%M%S)"
build.sh
Outdated
-e "s|@PACKAGE_VERSION@|$PACKAGE_VERSION|g" \ | ||
< ovirt-ansible-repositories.spec.in > ovirt-ansible-repositories.spec | ||
|
||
git ls-files | tar --files-from /proc/self/fd/0 -czf "$TARBALL" ovirt-ansible-vm-infra.spec |
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.
git ls-files | tar --files-from /proc/self/fd/0 -czf "$TARBALL" ovirt-ansible-repositories.spec
ovirt-ansible-repositories.spec.in
Outdated
%global ansible_roles_dir ansible/roles | ||
|
||
Name: @PACKAGE_NAME@ | ||
Summary: Ansible role to create virtual machine infrastructure |
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.
Summary: Ansible role to setup oVirt/RHV repositories
ovirt-ansible-repositories.spec.in
Outdated
Requires: ansible >= 2.4 | ||
|
||
%description | ||
This Ansible role is used to set the repositories required for |
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.
s/set/set up/
seems better for me, but I am not sure.
ovirt-ansible-repositories.spec.in
Outdated
This Ansible role is used to set the repositories required for | ||
oVirt engine or host installation. | ||
|
||
%pretrans -p <lua> |
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.
You can remove this %pretrans
, it was used only for roles which existed in 4.1
Thanks for contributing automation files 👍 |
build.sh
Outdated
ln -f -s $PKG_DATA_DIR_ORIG $ROLENAME_LEGACY | ||
|
||
cp -pR defaults/ $PKG_DATA_DIR | ||
cp -pR library/ $PKG_DATA_DIR |
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.
you can remove this line
cbde719
to
670b1cb
Compare
@mwperina @machacekondra Anything else I could change here? If not let's proceed with merging this one because tests for oVirt/ovirt-ansible-engine-setup#1 are depending on this role. |
Hello contributor, thanks for submitting a PR for an this project! I am the bot who triggers "standard-CI" builds for this project. In order to allow automated tests to run, please ask one of the project maintainers to review the code and then do one of the following:
Note: You might see multiple messages like this showing up on a single PR, this is due to a known bug in the GitHub trigger plugin on Jenkins, the infra team is working on fixing this via new testing flow in the near future, so we'll be able to post a single message per PR. |
Some tests failed |
ci add to whitelist |
ci build please |
Some tests failed |
1 similar comment
Some tests failed |
ci add to whitelist |
ci build please |
@mwperina Do we want to create legacy symlink for newly created roles? Or are we ok with name just |
No, new roles (unreleased in oVirt 4.1.z) should have only the new name, ie |
ovirt-ansible-repositories.spec.in
Outdated
This Ansible role is used to set up the repositories required for | ||
oVirt engine or host installation. | ||
|
||
-- Remove the legacy directory before installing the symlink. This is known issue in RPM: |
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.
Please remove lines 22-28
build.sh
Outdated
PKG_DATA_DIR=${PKG_DATA_DIR:-$ROLES_DATAROOT_DIR/$PACKAGE_NAME} | ||
PKG_DATA_DIR_ORIG=${PKG_DATA_DIR_ORIG:-$PKG_DATA_DIR} | ||
PKG_DOC_DIR=${PKG_DOC_DIR:-$DOC_DIR/$PACKAGE_NAME} | ||
ROLENAME_LEGACY="${ROLENAME_LEGACY:-$ROLES_DATAROOT_DIR/ovirt-repositories}" |
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.
Please remove this line.
build.sh
Outdated
mkdir -p $PKG_DOC_DIR | ||
|
||
# Create a symlink, so legacy role name does work: | ||
ln -f -s $PKG_DATA_DIR_ORIG $ROLENAME_LEGACY |
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.
Please remove line 43 and 44.
ovirt-ansible-repositories.spec.in
Outdated
@@ -0,0 +1,53 @@ | |||
%global rolename repositories | |||
%global roleprefix oVirt. | |||
%global roleprefix_legacy ovirt- |
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.
Please remove this line.
ovirt-ansible-repositories.spec.in
Outdated
export PKG_DATA_DIR_ORIG=%{_datadir}/%{ansible_roles_dir}/%{roleprefix}%{rolename} | ||
export PKG_DATA_DIR=%{buildroot}$PKG_DATA_DIR_ORIG | ||
export PKG_DOC_DIR=%{buildroot}%{_pkgdocdir} | ||
export ROLENAME_LEGACY=%{buildroot}%{_datadir}/%{ansible_roles_dir}/%{roleprefix_legacy}%{rolename} |
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.
Please remove this line.
ovirt-ansible-repositories.spec.in
Outdated
|
||
%files | ||
%{_datadir}/%{ansible_roles_dir}/%{roleprefix}%{rolename} | ||
%{_datadir}/%{ansible_roles_dir}/%{roleprefix_legacy}%{rolename} |
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.
Please remove this line.
670b1cb
to
3872fef
Compare
ci test please |
ci buid please |
Thanks for quick reviews! |
No description provided.