[PATCH conductor] BZ834632: Fix deployment autoupdate
by Imre Farkas
From: Imre Farkas <ifarkas(a)redhat.com>
https://bugzilla.redhat.com/show_bug.cgi?id=834632
Autoupdate tried to update the deployment via a wrong url: the url prefix (e.g. 'conductor' in case of rpm) was added twice.
---
src/public/javascripts/backbone/models.js | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/public/javascripts/backbone/models.js b/src/public/javascripts/backbone/models.js
index 4c3084d..8691741 100644
--- a/src/public/javascripts/backbone/models.js
+++ b/src/public/javascripts/backbone/models.js
@@ -63,7 +63,7 @@ Conductor.Models.Deployment = Backbone.Model.extend({
this.instances = new Conductor.Models.Instances();
var self = this;
this.instances.url = function() {
- var path = Conductor.prefixedPath(self.urlRoot + '/' + self.id + '/instances');
+ var path = self.urlRoot + '/' + self.id + '/instances';
return Conductor.parameterizedPath(path, self.queryParams);
};
}
--
1.7.10.4
11 years, 9 months
[PATCH conductor]condutor extended with hwp functionality
by Samridh
This patch modifies the hwp controller and the hwp views to return data in XML format.
Specifically, the create, destroy, index and show methods have been extended and the XML data is returned by suitably formatted templates.
NOTE: When a particular hardware_profile_property is nil, I return the string "nil" in the XML template instead of an empty XML element. This is due to the special significance of nil values in hwps.
11 years, 9 months
automated upstream testing is now live on travis-ci.org
by Richard Su
You may have already noticed from our first build status email from
Travis CI.
For upstream, tests are kicked off when a change is committed to
aeolusproject/github. The tests consists of running cucumber and rspec
in a Bundler environment and reporting their results. No rpms are
installed and aeolus-configure is not executed.
Many tests are broken, around 18 for cucumber and around 228 for rspec.
These are known issues because some of our tests are dependent on having
services like deltacloud-core up. I believe Jay is already helping to
fix some of these. The plan is to get more people on board to fix the
others in future sprints.
The current build status can found at
http://travis-ci.org/#!/aeolusproject/conductor
More information and an evaluation of other CI providers can be found at
https://www.aeolusproject.org/redmine/projects/aeolus/wiki/Continuous_Int...
Thanks,
Richard
11 years, 9 months
[PATCH conductor] BZ #807267: aeolus-debug is broken.
by Jason Guiditta
https://bugzilla.redhat.com/show_bug.cgi?id=807267
Alarmist subject aside, the issue was actually that specifying the
--dir option was causing an error, standard run of aeolus-debug was
still working fine.
The cause of this was a simple error in how we were contructing the
path being passed into the tar command.
---
src/lib/aeolus/debug/aeolus-debug | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/src/lib/aeolus/debug/aeolus-debug b/src/lib/aeolus/debug/aeolus-debug
index cc45788..45224c1 100755
--- a/src/lib/aeolus/debug/aeolus-debug
+++ b/src/lib/aeolus/debug/aeolus-debug
@@ -78,13 +78,13 @@ system("rpm -qa | egrep 'aeolus|iwhd|deltacloud|imagefactory|oz' >> #{File.join(
system("virsh capabilities >> #{File.join(target_dir, 'virsh_capabilities')}")
# Tar the output and log it
-tarfile = target_dir + ".tar.gz"
+tarfile = timename + ".tar.gz"
pwd = Dir.pwd()
Dir.chdir(options[:basedir])
system("tar -czvf #{tarfile} #{timename}")
Dir.chdir(pwd)
-puts "A debug file has been created at #{tarfile}."
+puts "A debug file has been created at #{File.join(options[:basedir],timename)}."
# Clean up
FileUtils.rm_r(target_dir)
--
1.7.7.6
11 years, 9 months
[PATCH conductor] Add junit task to run cukes for CI server.
by Jason Guiditta
---
src/config/cucumber.yml | 1 +
src/lib/tasks/custom_cucumber.rake | 16 ++++++++++++++++
2 files changed, 17 insertions(+), 0 deletions(-)
create mode 100644 src/lib/tasks/custom_cucumber.rake
diff --git a/src/config/cucumber.yml b/src/config/cucumber.yml
index 19b288d..49823b3 100644
--- a/src/config/cucumber.yml
+++ b/src/config/cucumber.yml
@@ -6,3 +6,4 @@ std_opts = "--format #{ENV['CUCUMBER_FORMAT'] || 'pretty'} --strict --tags ~@wip
default: <%= std_opts %> features
wip: --tags @wip:3 --wip features
rerun: <%= rerun_opts %> --format rerun --out rerun.txt --strict --tags ~@wip
+junit: --format junit --out results/ features
diff --git a/src/lib/tasks/custom_cucumber.rake b/src/lib/tasks/custom_cucumber.rake
new file mode 100644
index 0000000..d3bf847
--- /dev/null
+++ b/src/lib/tasks/custom_cucumber.rake
@@ -0,0 +1,16 @@
+begin
+ require 'cucumber/rake/task'
+
+ namespace :cucumber do
+ Cucumber::Rake::Task.new({:junit => ['db:test:prepare','db:seed']}, 'Run features via junit') do |t|
+ t.fork = true # You may get faster startup if you set this to false
+ t.profile = 'junit'
+ end
+ end
+
+rescue LoadError
+ desc 'cucumber rake task not available (cucumber not installed)'
+ task :cucumber do
+ abort 'Cucumber rake task is not available. Be sure to install cucumber as a gem or plugin'
+ end
+end
--
1.7.7.6
11 years, 9 months
[PATCH website] get_it: added fedora 17
by Maros Zatko
From: Maros Zatko <mzatko(a)redhat.com>
---
nanocsite/content/get_it.haml | 79 ++++++++++++++++++++++++++++-------------
1 file changed, 55 insertions(+), 24 deletions(-)
diff --git a/nanocsite/content/get_it.haml b/nanocsite/content/get_it.haml
index 6338638..b80d9ac 100644
--- a/nanocsite/content/get_it.haml
+++ b/nanocsite/content/get_it.haml
@@ -32,7 +32,7 @@ title: Aeolus | Get It
Stable Release - 0.9.0
%p
- Aeolus is available for Fedora 15 and 16, as well as RHEL/CentOS 6.2.
+ Aeolus is available for Fedora 15, 16 and 17, as well as RHEL/CentOS 6.2.
64-bit only in all cases.
%p
@@ -40,6 +40,8 @@ title: Aeolus | Get It
%ul
%li
+ <a href='#stabfed17" title="Fedora 17"'>Fedora 17</a>
+ %li
<a href="#stabfed1516" title="Fedora 15 and 16">Fedora 15 and 16</a>
%li
<a href="#stabrhel6" title="Red Hat Enterprise Linux/CentOS 6.2">Red Hat Enterprise Linux and CentOS 6.2</a>
@@ -47,6 +49,33 @@ title: Aeolus | Get It
%br
.section-grouping
+ %h2(id="stabfed17") Installation for Fedora 17 (64-bit only)
+
+ %h3 1. Install Aeolus
+
+ %p.note
+ Please note that some things are not fully finished on Fedora 17 yet.
+ If you experience any problems please try to resolve it using
+ testing repository below.
+
+ %p
+ %pre
+ :preserve
+ $ sudo yum install aeolus-all
+
+ %p
+ This will install the latest Aeolus stable
+ packages, along with their dependencies, on the system.
+
+ %p
+
+ %a.button{ :href => "/gsg/0.9.0/configuring_aeolus.html" }
+ Configure It
+ %img{:src => "images/button-right.png", :alt => "→"}
+
+%br
+
+.section-grouping
%h2(id="stabfed1516") Installation for Fedora 15 and 16 (64-bit only)
%h3 1. Add the Aeolus Fedora 15/16 Stable yum repository
@@ -126,6 +155,8 @@ title: Aeolus | Get It
%ul
%li
+ <a href='#devfed17" title="Fedora 17"'>Fedora 17</a>
+ %li
<a href="#devfed1516" title="Fedora 15 and 16">Fedora 15 and 16</a>
%li
<a href="#devrhel6" title="Red Hat Enterprise Linux/CentOS 6.2">Red Hat Enterprise Linux and CentOS 6.2</a>
@@ -133,22 +164,25 @@ title: Aeolus | Get It
%br
.section-grouping
- %h2(id="devfed1516") Installation for Fedora 15 and 16 (64-bit only)
+ %h2(id="devfed17") Installation for Fedora 17 (64-bit only)
- %h3 1. Add the Aeolus Fedora 15/16 Testing yum repository
+ %h3 1. Install Aeolus
- %p
- %pre
- :preserve
- $ sudo curl -o /etc/yum.repos.d/fedora-aeolus-testing.repo \
- http://repos.fedorapeople.org/repos/aeolus/conductor/testing/fedora-aeolu...
+ -#%p.note
+ %b NOTE -
+ You need to enable the Fedora Updates Testing repository at present, for
+ all of the Aeolus packages to install correctly.
- %h3 2. Install Aeolus
+ %br
+ %br
+
+ This is a temporary measure only, and should be resolved in time for the
+ Fedora 17 release.
%p
%pre
:preserve
- $ sudo yum install aeolus-all
+ $ sudo yum install aeolus-all --enablerepo=updates-testing
%p
This will install the latest Aeolus testing
@@ -160,28 +194,25 @@ title: Aeolus | Get It
Configure It
%img{:src => "images/button-right.png", :alt => "→"}
--#%br
-
--#.section-grouping
- %h2(id="devfed17") Installation for Fedora 17 (beta) (64-bit only)
+%br
- %h3 1. Install Aeolus
+.section-grouping
+ %h2(id="devfed1516") Installation for Fedora 15 and 16 (64-bit only)
- %p.note
- %b NOTE -
- You need to enable the Fedora Updates Testing repository at present, for
- all of the Aeolus packages to install correctly.
+ %h3 1. Add the Aeolus Fedora 15/16 Testing yum repository
- %br
- %br
+ %p
+ %pre
+ :preserve
+ $ sudo curl -o /etc/yum.repos.d/fedora-aeolus-testing.repo \
+ http://repos.fedorapeople.org/repos/aeolus/conductor/testing/fedora-aeolu...
- This is a temporary measure only, and should be resolved in time for the
- Fedora 17 release.
+ %h3 2. Install Aeolus
%p
%pre
:preserve
- $ sudo yum install aeolus-all --enablerepo=updates-testing
+ $ sudo yum install aeolus-all
%p
This will install the latest Aeolus testing
--
1.7.10.2
11 years, 9 months