2 commits - java/code java/spacewalk-java.spec rel-eng/packages
by Grant Gainey
java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/test/IssMasterSerializerTest.java | 3
java/code/src/com/redhat/rhn/frontend/xmlrpc/sync/master/test/MasterHandlerTest.java | 39 +++++-----
java/code/src/com/redhat/rhn/frontend/xmlrpc/sync/slave/test/SlaveHandlerTest.java | 25 +++---
java/spacewalk-java.spec | 5 +
rel-eng/packages/spacewalk-java | 2
5 files changed, 42 insertions(+), 32 deletions(-)
New commits:
commit 060028c0ff51b7759c1669553f0ef23407601e87
Author: Grant Gainey <ggainey(a)redhat.com>
Date: Tue Jul 2 15:58:53 2013 -0400
Automatic commit of package [spacewalk-java] release [1.10.112-1].
diff --git a/java/spacewalk-java.spec b/java/spacewalk-java.spec
index 174afec..e65a7ad 100644
--- a/java/spacewalk-java.spec
+++ b/java/spacewalk-java.spec
@@ -28,7 +28,7 @@ Name: spacewalk-java
Summary: Spacewalk Java site packages
Group: Applications/Internet
License: GPLv2
-Version: 1.10.111
+Version: 1.10.112
Release: 1%{?dist}
URL: https://fedorahosted.org/spacewalk
Source0: https://fedorahosted.org/releases/s/p/spacewalk/%{name}-%{version}.tar.gz
@@ -751,6 +751,9 @@ fi
%{jardir}/postgresql-jdbc.jar
%changelog
+* Tue Jul 02 2013 Grant Gainey 1.10.112-1
+- 977878 - Keep some unit-tests from overlapping
+
* Tue Jul 02 2013 Tomas Kasparek <tkasparek(a)redhat.com> 1.10.111-1
- checkstyle fix
diff --git a/rel-eng/packages/spacewalk-java b/rel-eng/packages/spacewalk-java
index 54f61bb..80a0633 100644
--- a/rel-eng/packages/spacewalk-java
+++ b/rel-eng/packages/spacewalk-java
@@ -1 +1 @@
-1.10.111-1 java/
+1.10.112-1 java/
commit f7fb1238a6de4cfd028a52607544ae2ec7fdebdf
Author: Grant Gainey <ggainey(a)redhat.com>
Date: Tue Jul 2 15:58:05 2013 -0400
977878 - Keep some unit-tests from overlapping
diff --git a/java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/test/IssMasterSerializerTest.java b/java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/test/IssMasterSerializerTest.java
index 697ac50..490bfda 100644
--- a/java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/test/IssMasterSerializerTest.java
+++ b/java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/test/IssMasterSerializerTest.java
@@ -31,6 +31,7 @@ import com.redhat.rhn.domain.iss.IssMaster;
import com.redhat.rhn.domain.iss.IssMasterOrg;
import com.redhat.rhn.frontend.xmlrpc.serializer.IssMasterOrgSerializer;
import com.redhat.rhn.frontend.xmlrpc.serializer.IssMasterSerializer;
+import com.redhat.rhn.testing.TestUtils;
public class IssMasterSerializerTest extends MockObjectTestCase {
private String[] masterOrgNames = {"masterOrg1", "masterOrg2", "masterOrg3"};
@@ -69,7 +70,7 @@ public class IssMasterSerializerTest extends MockObjectTestCase {
long baseId = 1001L;
IssMaster master = new IssMaster();
- master.setLabel("testMaster");
+ master.setLabel("testMaster" + TestUtils.randomString());
Set<IssMasterOrg> orgs = new HashSet<IssMasterOrg>();
for (String orgName : masterOrgNames) {
IssMasterOrg anOrg = new IssMasterOrg();
diff --git a/java/code/src/com/redhat/rhn/frontend/xmlrpc/sync/master/test/MasterHandlerTest.java b/java/code/src/com/redhat/rhn/frontend/xmlrpc/sync/master/test/MasterHandlerTest.java
index 67db63f..0aa78c7 100644
--- a/java/code/src/com/redhat/rhn/frontend/xmlrpc/sync/master/test/MasterHandlerTest.java
+++ b/java/code/src/com/redhat/rhn/frontend/xmlrpc/sync/master/test/MasterHandlerTest.java
@@ -27,21 +27,24 @@ import com.redhat.rhn.domain.role.RoleFactory;
import com.redhat.rhn.frontend.xmlrpc.PermissionCheckFailureException;
import com.redhat.rhn.frontend.xmlrpc.sync.master.MasterHandler;
import com.redhat.rhn.frontend.xmlrpc.test.BaseHandlerTestCase;
+import com.redhat.rhn.testing.TestUtils;
public class MasterHandlerTest extends BaseHandlerTestCase {
private MasterHandler handler = new MasterHandler();
private String[] masterOrgNames = {"masterOrg01", "masterOrg02", "masterOrg03"};
+ private String masterName;
public void setUp() throws Exception {
super.setUp();
+ masterName = "testMaster" + TestUtils.randomString();
admin.addRole(RoleFactory.SAT_ADMIN);
}
public void testCreate() {
// Make sure that non-sat-admin users cannot access
try {
- IssMaster master = handler.create(regularKey, "testCreate");
+ IssMaster master = handler.create(regularKey, masterName);
fail();
}
catch (PermissionCheckFailureException e) {
@@ -50,8 +53,8 @@ public class MasterHandlerTest extends BaseHandlerTestCase {
// Make sure satellite-admin can
try {
- IssMaster master = handler.create(adminKey, "testCreate");
- assertEquals("testCreate", master.getLabel());
+ IssMaster master = handler.create(adminKey, masterName);
+ assertEquals(masterName, master.getLabel());
}
catch (PermissionCheckFailureException e) {
fail();
@@ -59,13 +62,13 @@ public class MasterHandlerTest extends BaseHandlerTestCase {
}
public void testUpdate() {
- IssMaster master = handler.create(adminKey, "testCreate");
+ IssMaster master = handler.create(adminKey, masterName);
// Make sure that non-sat-admin users cannot access
try {
IssMaster updMaster = handler.update(regularKey,
master.getId().intValue(),
- "testCreateNew");
+ "new_" + masterName);
fail();
}
catch (PermissionCheckFailureException e) {
@@ -75,8 +78,8 @@ public class MasterHandlerTest extends BaseHandlerTestCase {
// Make sure satellite-admin can
try {
IssMaster updMaster = handler.update(adminKey, master.getId().intValue(),
- "testCreateNew");
- assertEquals("testCreateNew", updMaster.getLabel());
+ "new_" + masterName);
+ assertEquals("new_" + masterName, updMaster.getLabel());
assertEquals(master.getId(), updMaster.getId());
}
catch (PermissionCheckFailureException e) {
@@ -85,7 +88,7 @@ public class MasterHandlerTest extends BaseHandlerTestCase {
}
public void testDelete() {
- IssMaster master = handler.create(adminKey, "testCreate");
+ IssMaster master = handler.create(adminKey, masterName);
Long mstrId = master.getId();
// Make sure that non-sat-admin users cannot access
@@ -112,7 +115,7 @@ public class MasterHandlerTest extends BaseHandlerTestCase {
}
public void testGetMaster() {
- IssMaster master = handler.create(adminKey, "testCreate");
+ IssMaster master = handler.create(adminKey, masterName);
Integer mstrId = master.getId().intValue();
// Make sure that non-sat-admin users cannot access
@@ -135,11 +138,11 @@ public class MasterHandlerTest extends BaseHandlerTestCase {
}
public void testGetMasterByLabel() {
- IssMaster master = handler.create(adminKey, "testCreate");
+ IssMaster master = handler.create(adminKey, masterName);
// Make sure that non-sat-admin users cannot access
try {
- IssMaster gotMaster = handler.getMasterByLabel(regularKey, "testCreate");
+ IssMaster gotMaster = handler.getMasterByLabel(regularKey, masterName);
fail();
}
catch (PermissionCheckFailureException e) {
@@ -148,9 +151,9 @@ public class MasterHandlerTest extends BaseHandlerTestCase {
// Make sure satellite-admin can
try {
- IssMaster gotMaster = handler.getMasterByLabel(adminKey, "testCreate");
+ IssMaster gotMaster = handler.getMasterByLabel(adminKey, masterName);
assertNotNull(gotMaster);
- assertEquals("testCreate", gotMaster.getLabel());
+ assertEquals(masterName, gotMaster.getLabel());
}
catch (PermissionCheckFailureException e) {
fail();
@@ -158,7 +161,7 @@ public class MasterHandlerTest extends BaseHandlerTestCase {
}
public void testGetMasterOrgs() {
- IssMaster master = handler.create(adminKey, "testCreate");
+ IssMaster master = handler.create(adminKey, masterName);
// Make sure that non-sat-admin users cannot access
try {
@@ -184,7 +187,7 @@ public class MasterHandlerTest extends BaseHandlerTestCase {
}
public void testMappedMasterOrgs() {
- IssMaster master = handler.create(adminKey, "testCreate");
+ IssMaster master = handler.create(adminKey, masterName);
addOrgsTo(master, false);
assertEquals(0, master.getNumMappedMasterOrgs());
assertEquals(masterOrgNames.length, master.getNumMasterOrgs());
@@ -230,7 +233,7 @@ public class MasterHandlerTest extends BaseHandlerTestCase {
}
public void testSetMasterOrgs() {
- IssMaster master = handler.create(adminKey, "testCreate");
+ IssMaster master = handler.create(adminKey, masterName);
List<IssMasterOrg> someOrgs = getBareOrgs(true);
@@ -290,7 +293,7 @@ public class MasterHandlerTest extends BaseHandlerTestCase {
}
public void testAddOrg() {
- IssMaster master = handler.create(adminKey, "testCreate");
+ IssMaster master = handler.create(adminKey, masterName);
IssMasterOrg org = new IssMasterOrg();
org.setMasterOrgName("newMasterOrg");
org.setMasterOrgId(1001L);
@@ -325,7 +328,7 @@ public class MasterHandlerTest extends BaseHandlerTestCase {
public void testMapToLocal() {
IssMaster master = new IssMaster();
- master.setLabel("testCreate");
+ master.setLabel(masterName);
IssFactory.save(master);
addOrgsTo(master, false);
diff --git a/java/code/src/com/redhat/rhn/frontend/xmlrpc/sync/slave/test/SlaveHandlerTest.java b/java/code/src/com/redhat/rhn/frontend/xmlrpc/sync/slave/test/SlaveHandlerTest.java
index 876ba65..48e13ca 100644
--- a/java/code/src/com/redhat/rhn/frontend/xmlrpc/sync/slave/test/SlaveHandlerTest.java
+++ b/java/code/src/com/redhat/rhn/frontend/xmlrpc/sync/slave/test/SlaveHandlerTest.java
@@ -25,20 +25,23 @@ import com.redhat.rhn.domain.role.RoleFactory;
import com.redhat.rhn.frontend.xmlrpc.PermissionCheckFailureException;
import com.redhat.rhn.frontend.xmlrpc.sync.slave.SlaveHandler;
import com.redhat.rhn.frontend.xmlrpc.test.BaseHandlerTestCase;
+import com.redhat.rhn.testing.TestUtils;
public class SlaveHandlerTest extends BaseHandlerTestCase {
private SlaveHandler handler = new SlaveHandler();
+ private String slaveName;
public void setUp() throws Exception {
super.setUp();
admin.addRole(RoleFactory.SAT_ADMIN);
+ slaveName = "testSlave" + TestUtils.randomString();
}
public void testCreate() {
// Make sure that non-sat-admin users cannot access
try {
- IssSlave slave = handler.create(regularKey, "testCreate", true, true);
+ IssSlave slave = handler.create(regularKey, slaveName, true, true);
fail();
}
catch (PermissionCheckFailureException e) {
@@ -47,8 +50,8 @@ public class SlaveHandlerTest extends BaseHandlerTestCase {
// Make sure satellite-admin can
try {
- IssSlave slave = handler.create(adminKey, "testCreate", true, true);
- assertEquals("testCreate", slave.getSlave());
+ IssSlave slave = handler.create(adminKey, slaveName, true, true);
+ assertEquals(slaveName, slave.getSlave());
assertTrue("Y".equals(slave.getEnabled()));
assertTrue("Y".equals(slave.getAllowAllOrgs()));
}
@@ -58,13 +61,13 @@ public class SlaveHandlerTest extends BaseHandlerTestCase {
}
public void testUpdate() {
- IssSlave slave = handler.create(adminKey, "testCreate", true, true);
+ IssSlave slave = handler.create(adminKey, slaveName, true, true);
// Make sure that non-sat-admin users cannot access
try {
IssSlave updSlave = handler.update(regularKey,
slave.getId().intValue(),
- "testCreateNew",
+ "new_" + slaveName,
false,
false);
fail();
@@ -76,8 +79,8 @@ public class SlaveHandlerTest extends BaseHandlerTestCase {
// Make sure satellite-admin can
try {
IssSlave updSlave = handler.update(adminKey, slave.getId().intValue(),
- "testCreateNew", false, false);
- assertEquals("testCreateNew", updSlave.getSlave());
+ "new_" + slaveName, false, false);
+ assertEquals("new_" + slaveName, updSlave.getSlave());
assertEquals(slave.getId(), updSlave.getId());
assertTrue("N".equals(slave.getEnabled()));
assertTrue("N".equals(slave.getAllowAllOrgs()));
@@ -88,7 +91,7 @@ public class SlaveHandlerTest extends BaseHandlerTestCase {
}
public void testDelete() {
- IssSlave slave = handler.create(adminKey, "testCreate", true, true);
+ IssSlave slave = handler.create(adminKey, slaveName, true, true);
Long slaveId = slave.getId();
// Make sure that non-sat-admin users cannot access
@@ -115,7 +118,7 @@ public class SlaveHandlerTest extends BaseHandlerTestCase {
}
public void testGetSlave() {
- IssSlave slave = handler.create(adminKey, "testCreate", true, true);
+ IssSlave slave = handler.create(adminKey, slaveName, true, true);
Integer slaveId = slave.getId().intValue();
// Make sure that non-sat-admin users cannot access
@@ -138,7 +141,7 @@ public class SlaveHandlerTest extends BaseHandlerTestCase {
}
public void testGetAllowedOrgs() {
- IssSlave slave = handler.create(adminKey, "testCreate", true, false);
+ IssSlave slave = handler.create(adminKey, slaveName, true, false);
// Make sure that non-sat-admin users cannot access
try {
@@ -163,7 +166,7 @@ public class SlaveHandlerTest extends BaseHandlerTestCase {
}
public void testSetAllowedOrgs() {
- IssSlave slave = handler.create(adminKey, "testCreate", true, false);
+ IssSlave slave = handler.create(adminKey, slaveName, true, false);
List<Integer> orgs = getBareOrgs();
10 years, 10 months
Changes to 'refs/tags/spacewalk-schema-1.10.58-1'
by StephenHerr
Tag 'spacewalk-schema-1.10.58-1' created by Stephen Herr <sherr(a)redhat.com> at 2013-07-02 19:07 +0000
Tagging package [spacewalk-schema] version [1.10.58-1] in directory [schema/spacewalk/].
Changes since spacewalk-backend-1.10.54-1:
Stephen Herr (1):
Automatic commit of package [spacewalk-schema] release [1.10.58-1].
---
rel-eng/packages/spacewalk-schema | 2 +-
schema/spacewalk/spacewalk-schema.spec | 5 ++++-
2 files changed, 5 insertions(+), 2 deletions(-)
---
10 years, 10 months
Changes to 'refs/tags/spacewalk-backend-1.10.54-1'
by StephenHerr
Tag 'spacewalk-backend-1.10.54-1' created by Stephen Herr <sherr(a)redhat.com> at 2013-07-02 19:07 +0000
Tagging package [spacewalk-backend] version [1.10.54-1] in directory [backend/].
Changes since spacewalk-java-1.10.111-1:
Stephen Herr (2):
977878 - move iss parent / ca_cert configs into database
Automatic commit of package [spacewalk-backend] release [1.10.54-1].
Tomas Kasparek (1):
start building Spacewalk on Fedora 19
---
backend/satellite_tools/satsync.py | 37 +++++++---
backend/spacewalk-backend.spec | 5 +
rel-eng/build-missing-builds.conf | 2
rel-eng/koji-missing-builds.py | 3
rel-eng/packages/spacewalk-backend | 2
rel-eng/releasers.conf | 2
rel-eng/tito.props | 6 +
schema/spacewalk/common/tables/rhnISSMaster.sql | 6 +
schema/spacewalk/upgrade/spacewalk-schema-1.9-to-spacewalk-schema-1.10/028-satellite_sync_master_in_db.sql | 6 +
spacewalk/config/var/lib/rhn/rhn-satellite-prep/etc/rhn/rhn.conf | 12 ---
10 files changed, 53 insertions(+), 28 deletions(-)
---
10 years, 10 months
Changes to 'refs/tags/spacewalk-config-1.10.5-1'
by StephenHerr
Tag 'spacewalk-config-1.10.5-1' created by Stephen Herr <sherr(a)redhat.com> at 2013-07-02 19:09 +0000
Tagging package [spacewalk-config] version [1.10.5-1] in directory [spacewalk/config/].
Changes since spacewalk-java-1.10.111-1:
Stephen Herr (4):
977878 - move iss parent / ca_cert configs into database
Automatic commit of package [spacewalk-backend] release [1.10.54-1].
Automatic commit of package [spacewalk-schema] release [1.10.58-1].
Automatic commit of package [spacewalk-config] release [1.10.5-1].
Tomas Kasparek (1):
start building Spacewalk on Fedora 19
---
backend/satellite_tools/satsync.py | 37 +++++++---
backend/spacewalk-backend.spec | 5 +
rel-eng/build-missing-builds.conf | 2
rel-eng/koji-missing-builds.py | 3
rel-eng/packages/spacewalk-backend | 2
rel-eng/packages/spacewalk-config | 2
rel-eng/packages/spacewalk-schema | 2
rel-eng/releasers.conf | 2
rel-eng/tito.props | 6 +
schema/spacewalk/common/tables/rhnISSMaster.sql | 6 +
schema/spacewalk/spacewalk-schema.spec | 5 +
schema/spacewalk/upgrade/spacewalk-schema-1.9-to-spacewalk-schema-1.10/028-satellite_sync_master_in_db.sql | 6 +
spacewalk/config/spacewalk-config.spec | 5 +
spacewalk/config/var/lib/rhn/rhn-satellite-prep/etc/rhn/rhn.conf | 12 ---
14 files changed, 63 insertions(+), 32 deletions(-)
---
10 years, 10 months
3 commits - backend/spacewalk-backend.spec rel-eng/packages schema/spacewalk spacewalk/config
by StephenHerr
backend/spacewalk-backend.spec | 5 ++++-
rel-eng/packages/spacewalk-backend | 2 +-
rel-eng/packages/spacewalk-config | 2 +-
rel-eng/packages/spacewalk-schema | 2 +-
schema/spacewalk/spacewalk-schema.spec | 5 ++++-
spacewalk/config/spacewalk-config.spec | 5 ++++-
6 files changed, 15 insertions(+), 6 deletions(-)
New commits:
commit 42d8153d41eec533ce1c56855ac75e4a15922ff2
Author: Stephen Herr <sherr(a)redhat.com>
Date: Tue Jul 2 15:09:45 2013 -0400
Automatic commit of package [spacewalk-config] release [1.10.5-1].
diff --git a/rel-eng/packages/spacewalk-config b/rel-eng/packages/spacewalk-config
index 986d25f..864f9d4 100644
--- a/rel-eng/packages/spacewalk-config
+++ b/rel-eng/packages/spacewalk-config
@@ -1 +1 @@
-1.10.4-1 spacewalk/config/
+1.10.5-1 spacewalk/config/
diff --git a/spacewalk/config/spacewalk-config.spec b/spacewalk/config/spacewalk-config.spec
index 3978616..02726d5 100644
--- a/spacewalk/config/spacewalk-config.spec
+++ b/spacewalk/config/spacewalk-config.spec
@@ -1,6 +1,6 @@
Name: spacewalk-config
Summary: Spacewalk Configuration
-Version: 1.10.4
+Version: 1.10.5
Release: 1%{?dist}
URL: http://fedorahosted.org/spacewalk
Source0: https://fedorahosted.org/releases/s/p/spacewalk/%{name}-%{version}.tar.gz
@@ -104,6 +104,9 @@ chgrp apache /etc/rhn /etc/rhn/rhn.conf /etc/rhn/cluster.ini 2> /dev/null || :
chmod o-rwx /etc/rhn/rhn.conf* /etc/rhn/cluster.ini* /etc/sysconfig/rhn/backup-* /var/lib/rhn/rhn-satellite-prep/* 2> /dev/null || :
%changelog
+* Tue Jul 02 2013 Stephen Herr <sherr(a)redhat.com> 1.10.5-1
+- 977878 - move iss parent / ca_cert configs into database
+
* Wed Jun 12 2013 Tomas Kasparek <tkasparek(a)redhat.com> 1.10.4-1
- rebrading RHN Satellite to Red Hat Satellite
commit 309f037017c9ff6472f7aeacd774991f6dc49ab9
Author: Stephen Herr <sherr(a)redhat.com>
Date: Tue Jul 2 15:07:26 2013 -0400
Automatic commit of package [spacewalk-schema] release [1.10.58-1].
diff --git a/rel-eng/packages/spacewalk-schema b/rel-eng/packages/spacewalk-schema
index 767cf28..283b7d7 100644
--- a/rel-eng/packages/spacewalk-schema
+++ b/rel-eng/packages/spacewalk-schema
@@ -1 +1 @@
-1.10.57-1 schema/spacewalk/
+1.10.58-1 schema/spacewalk/
diff --git a/schema/spacewalk/spacewalk-schema.spec b/schema/spacewalk/spacewalk-schema.spec
index 51be77a..5492ea1 100644
--- a/schema/spacewalk/spacewalk-schema.spec
+++ b/schema/spacewalk/spacewalk-schema.spec
@@ -4,7 +4,7 @@ Name: spacewalk-schema
Group: Applications/Internet
Summary: Oracle SQL schema for Spacewalk server
-Version: 1.10.57
+Version: 1.10.58
Release: 1%{?dist}
Source0: %{name}-%{version}.tar.gz
@@ -71,6 +71,9 @@ rm -rf $RPM_BUILD_ROOT
%{_mandir}/man1/spacewalk-sql*
%changelog
+* Tue Jul 02 2013 Stephen Herr <sherr(a)redhat.com> 1.10.58-1
+- 977878 - move iss parent / ca_cert configs into database
+
* Tue Jul 02 2013 Milan Zazrivec <mzazrivec(a)redhat.com> 1.10.57-1
- Spacewalk user: add read_only flag
commit 329c4d4e30e7e2dd2afcf10ab95c364223c1d5b6
Author: Stephen Herr <sherr(a)redhat.com>
Date: Tue Jul 2 15:07:03 2013 -0400
Automatic commit of package [spacewalk-backend] release [1.10.54-1].
diff --git a/backend/spacewalk-backend.spec b/backend/spacewalk-backend.spec
index c04d63c..8fcf649 100644
--- a/backend/spacewalk-backend.spec
+++ b/backend/spacewalk-backend.spec
@@ -12,7 +12,7 @@ Name: spacewalk-backend
Summary: Common programs needed to be installed on the Spacewalk servers/proxies
Group: Applications/Internet
License: GPLv2
-Version: 1.10.53
+Version: 1.10.54
Release: 1%{?dist}
URL: https://fedorahosted.org/spacewalk
Source0: https://fedorahosted.org/releases/s/p/spacewalk/%{name}-%{version}.tar.gz
@@ -639,6 +639,9 @@ rm -f %{rhnconf}/rhnSecret.py*
# $Id$
%changelog
+* Tue Jul 02 2013 Stephen Herr <sherr(a)redhat.com> 1.10.54-1
+- 977878 - move iss parent / ca_cert configs into database
+
* Fri Jun 28 2013 Stephen Herr <sherr(a)redhat.com> 1.10.53-1
- 977878 - fixing ISS demo problem, this query should get org ids
diff --git a/rel-eng/packages/spacewalk-backend b/rel-eng/packages/spacewalk-backend
index bd4d927..7adb937 100644
--- a/rel-eng/packages/spacewalk-backend
+++ b/rel-eng/packages/spacewalk-backend
@@ -1 +1 @@
-1.10.53-1 backend/
+1.10.54-1 backend/
10 years, 10 months
backend/satellite_tools schema/spacewalk spacewalk/config
by StephenHerr
backend/satellite_tools/satsync.py | 37 +++++++---
schema/spacewalk/common/tables/rhnISSMaster.sql | 6 +
schema/spacewalk/upgrade/spacewalk-schema-1.9-to-spacewalk-schema-1.10/028-satellite_sync_master_in_db.sql | 6 +
spacewalk/config/var/lib/rhn/rhn-satellite-prep/etc/rhn/rhn.conf | 12 ---
4 files changed, 39 insertions(+), 22 deletions(-)
New commits:
commit 83d0a2fc447ac75ca42047f564f402c4d9fa7d6f
Author: Stephen Herr <sherr(a)redhat.com>
Date: Tue Jul 2 15:06:39 2013 -0400
977878 - move iss parent / ca_cert configs into database
diff --git a/backend/satellite_tools/satsync.py b/backend/satellite_tools/satsync.py
index aa465d7..9b259db 100644
--- a/backend/satellite_tools/satsync.py
+++ b/backend/satellite_tools/satsync.py
@@ -2048,6 +2048,23 @@ def _getImportedChannels():
exitWithTraceback(e, 'SQL ERROR during xml processing', 17)
return []
+def getDbIssParent():
+ sql = "select label from rhnISSMaster where is_current_master = 'Y'"
+ h = rhnSQL.prepare(sql)
+ h.execute()
+ row = h.fetchone_dict()
+ if not row:
+ return None
+ return row['label']
+
+def getDbCaChain(master):
+ sql = "select ca_cert from rhnISSMaster where label = :label"
+ h = rhnSQL.prepare(sql)
+ h.execute(label=master)
+ row = h.fetchone_dict()
+ if not row:
+ return None
+ return row['ca_cert']
def processCommandline():
"process the commandline, setting the OPTIONS object"
@@ -2139,6 +2156,15 @@ def processCommandline():
#
# process anything CFG related (db, debug, server, and print)
#
+ try:
+ rhnSQL.initDB()
+ except (SQLError, SQLSchemaError, SQLConnectError), e:
+ # An SQL error is fatal... crash and burn
+ log(-1, _("ERROR: Can't connect to the database: %s") % e, stream=sys.stderr)
+ log(-1, _("ERROR: Check if your database is running."), stream=sys.stderr)
+ sys.exit(20)
+
+ CFG.set("ISS_Parent", getDbIssParent())
CFG.set("TRACEBACK_MAIL", OPTIONS.traceback_mail or CFG.TRACEBACK_MAIL)
CFG.set("RHN_PARENT", idn_ascii_to_pune(OPTIONS.iss_parent or OPTIONS.server or \
CFG.ISS_PARENT or CFG.RHN_PARENT))
@@ -2147,20 +2173,13 @@ def processCommandline():
CFG.set("ISS_PARENT", None)
else:
CFG.set("ISS_PARENT", idn_ascii_to_pune(OPTIONS.iss_parent or CFG.ISS_PARENT))
- CFG.set("ISS_CA_CHAIN", OPTIONS.ca_cert or CFG.ISS_CA_CHAIN or CFG.CA_CHAIN)
+ CFG.set("ISS_CA_CHAIN", OPTIONS.ca_cert or getDbCaChain(CFG.RHN_PARENT)
+ or CFG.CA_CHAIN)
CFG.set("HTTP_PROXY", idn_ascii_to_pune(OPTIONS.http_proxy or CFG.HTTP_PROXY))
CFG.set("HTTP_PROXY_USERNAME", OPTIONS.http_proxy_username or CFG.HTTP_PROXY_USERNAME)
CFG.set("HTTP_PROXY_PASSWORD", OPTIONS.http_proxy_password or CFG.HTTP_PROXY_PASSWORD)
CFG.set("CA_CHAIN", OPTIONS.ca_cert or CFG.CA_CHAIN)
-
- try:
- rhnSQL.initDB()
- except (SQLError, SQLSchemaError, SQLConnectError), e:
- # An SQL error is fatal... crash and burn
- log(-1, _("ERROR: Can't connect to the database: %s") % e, stream=sys.stderr)
- log(-1, _("ERROR: Check if your database is running."), stream=sys.stderr)
- sys.exit(20)
# check the validity of the debug level
if OPTIONS.debug_level:
diff --git a/schema/spacewalk/common/tables/rhnISSMaster.sql b/schema/spacewalk/common/tables/rhnISSMaster.sql
index 54db1a5..7cf906c 100644
--- a/schema/spacewalk/common/tables/rhnISSMaster.sql
+++ b/schema/spacewalk/common/tables/rhnISSMaster.sql
@@ -1,7 +1,11 @@
create table rhnIssMaster (
id number not null constraint rhn_iss_master_id_pk primary key,
label varchar2(256) not null constraint rhn_iss_master_label_uq unique,
- created timestamp with local time zone default (current_timestamp) not null
+ created timestamp with local time zone default (current_timestamp) not null,
+ is_current_master char(1) default 'N' not null constraint rhn_issm_master_yn check (is_current_master in ('Y', 'N')),
+ ca_cert varchar2(256)
);
create sequence rhn_issmaster_seq;
+
+create unique index rhn_issm_only_one_default on rhnISSMaster (is_current_master) where is_current_master = 'Y';
diff --git a/schema/spacewalk/upgrade/spacewalk-schema-1.9-to-spacewalk-schema-1.10/028-satellite_sync_master_in_db.sql b/schema/spacewalk/upgrade/spacewalk-schema-1.9-to-spacewalk-schema-1.10/028-satellite_sync_master_in_db.sql
new file mode 100644
index 0000000..49d1874
--- /dev/null
+++ b/schema/spacewalk/upgrade/spacewalk-schema-1.9-to-spacewalk-schema-1.10/028-satellite_sync_master_in_db.sql
@@ -0,0 +1,6 @@
+alter table rhnISSMaster add is_current_master char(1) default 'N' not null
+ constraint rhn_issm_master_yn check (is_current_master in ('Y', 'N'));
+
+alter table rhnISSMaster add ca_cert varchar2(256);
+
+create unique index rhn_issm_only_one_default on rhnISSMaster (is_current_master) where is_current_master = 'Y';
diff --git a/spacewalk/config/var/lib/rhn/rhn-satellite-prep/etc/rhn/rhn.conf b/spacewalk/config/var/lib/rhn/rhn-satellite-prep/etc/rhn/rhn.conf
index f221d43..26fff5f 100644
--- a/spacewalk/config/var/lib/rhn/rhn-satellite-prep/etc/rhn/rhn.conf
+++ b/spacewalk/config/var/lib/rhn/rhn-satellite-prep/etc/rhn/rhn.conf
@@ -10,18 +10,6 @@ server.satellite.http_proxy_username = @@serverDOTsatelliteDOThttp_proxy_usernam
server.satellite.http_proxy_password = @@serverDOTsatelliteDOThttp_proxy_password@@
server.satellite.ca_chain = @@serverDOTsatelliteDOTca_chain@@
-# Use these options if this server is intended to be a slave.
-# Name of parent for ISS.
-# # If left blank rhn_parent is taken by default.
-# # This option can be overriden on satellite-sync command line.
-iss_parent =
-iss_ca_chain = /usr/share/rhn/RHN-ORG-TRUSTED-SSL-CERT
-
-# Use this option if this server is intended to be a master
-# Comma separated list of allowed iss slaves, like:
-# allowed_iss_slaves=slave1-satellite.redhat.com,slave2-satellite.redhat.com
-allowed_iss_slaves=
-
# Completely disable ISS.
# If set to 1, then no slave will be able to sync from this server
# this option does not affect ability to sync to this server from
10 years, 10 months
rel-eng/build-missing-builds.conf rel-eng/koji-missing-builds.py rel-eng/releasers.conf rel-eng/tito.props
by Tomáš Kašpárek
rel-eng/build-missing-builds.conf | 2 +-
rel-eng/koji-missing-builds.py | 3 ++-
rel-eng/releasers.conf | 2 +-
rel-eng/tito.props | 6 +++++-
4 files changed, 9 insertions(+), 4 deletions(-)
New commits:
commit 2927a7a932fe73be61cbcc93c4d60a226d4b1962
Author: Tomas Kasparek <tkasparek(a)redhat.com>
Date: Tue Jul 2 16:30:56 2013 +0200
start building Spacewalk on Fedora 19
diff --git a/rel-eng/build-missing-builds.conf b/rel-eng/build-missing-builds.conf
index 0019e81..d9b074e 100644
--- a/rel-eng/build-missing-builds.conf
+++ b/rel-eng/build-missing-builds.conf
@@ -1,4 +1,4 @@
TITO_RELEASER=koji
-TAGS="spacewalk-nightly-rhel5 spacewalk-nightly-rhel6 spacewalk-nightly-fedora17 spacewalk-nightly-fedora18"
+TAGS="spacewalk-nightly-rhel5 spacewalk-nightly-rhel6 spacewalk-nightly-fedora17 spacewalk-nightly-fedora18 spacewalk-nightly-fedora19"
FEDORA_UPLOAD=0
diff --git a/rel-eng/koji-missing-builds.py b/rel-eng/koji-missing-builds.py
index f40c856..d8c0c82 100755
--- a/rel-eng/koji-missing-builds.py
+++ b/rel-eng/koji-missing-builds.py
@@ -36,7 +36,8 @@ distmap = {'rhel6':'.el6',
'rhel5':'.el5',
'rhel4':'.el4',
'fedora17':'.fc17',
- 'fedora18':'.fc18'}
+ 'fedora18':'.fc18',
+ 'fedora19':'.fc19'}
distsuffix = ''
tag = args[0]
diff --git a/rel-eng/releasers.conf b/rel-eng/releasers.conf
index f28fb8a..51a26fd 100644
--- a/rel-eng/releasers.conf
+++ b/rel-eng/releasers.conf
@@ -1,4 +1,4 @@
[koji]
releaser = tito.release.KojiGitReleaser
-autobuild_tags = spacewalk-nightly-rhel5 spacewalk-nightly-rhel6 spacewalk-nightly-fedora17 spacewalk-nightly-fedora18
+autobuild_tags = spacewalk-nightly-rhel5 spacewalk-nightly-rhel6 spacewalk-nightly-fedora17 spacewalk-nightly-fedora18 spacewalk-nightly-fedora19
git_url = git://git.fedorahosted.org/git/spacewalk.git
diff --git a/rel-eng/tito.props b/rel-eng/tito.props
index 81d997b..859abc7 100644
--- a/rel-eng/tito.props
+++ b/rel-eng/tito.props
@@ -6,7 +6,7 @@ changelog_do_not_remove_cherrypick = 0
lib_dir = rel-eng/lib
[koji]
-autobuild_tags = spacewalk-nightly-rhel5 spacewalk-nightly-rhel6 spacewalk-nightly-fedora17 spacewalk-nightly-fedora18
+autobuild_tags = spacewalk-nightly-rhel5 spacewalk-nightly-rhel6 spacewalk-nightly-fedora17 spacewalk-nightly-fedora18 spacewalk-nightly-fedora19
[spacewalk-nightly-rhel5]
disttag = .el5
@@ -23,3 +23,7 @@ blacklist=jabberd-selinux oracle-server-admin oracle-server-scripts rhnclient sm
[spacewalk-nightly-fedora18]
disttag = .fc18
blacklist=jabberd-selinux oracle-server-admin oracle-server-scripts rhnclient smartpm apt-spacewalk python-hwdata oracle-rhnsat-selinux mod_perl
+
+[spacewalk-nightly-fedora19]
+disttag = .fc19
+blacklist=jabberd-selinux oracle-server-admin oracle-server-scripts rhnclient smartpm apt-spacewalk python-hwdata oracle-rhnsat-selinux mod_perl
10 years, 10 months
Changes to 'refs/tags/spacewalk-java-1.10.111-1'
by Tomáš Kašpárek
Tag 'spacewalk-java-1.10.111-1' created by Tomas Kasparek <tkasparek(a)redhat.com> at 2013-07-02 14:15 +0000
Tagging package [spacewalk-java] version [1.10.111-1] in directory [java/].
Changes since spacewalk-java-1.10.110-1:
Tomas Kasparek (2):
checkstyle fix
Automatic commit of package [spacewalk-java] release [1.10.111-1].
---
java/code/src/com/redhat/rhn/frontend/action/systems/virtualization/VirtualGuestsListAction.java | 4 ++--
java/spacewalk-java.spec | 5 ++++-
rel-eng/packages/spacewalk-java | 2 +-
3 files changed, 7 insertions(+), 4 deletions(-)
---
10 years, 10 months
java/spacewalk-java.spec rel-eng/packages
by Tomáš Kašpárek
java/spacewalk-java.spec | 5 ++++-
rel-eng/packages/spacewalk-java | 2 +-
2 files changed, 5 insertions(+), 2 deletions(-)
New commits:
commit 9c57622ec15c95c945a4a7adb192f0ffed96cf25
Author: Tomas Kasparek <tkasparek(a)redhat.com>
Date: Tue Jul 2 16:15:58 2013 +0200
Automatic commit of package [spacewalk-java] release [1.10.111-1].
diff --git a/java/spacewalk-java.spec b/java/spacewalk-java.spec
index a013426..174afec 100644
--- a/java/spacewalk-java.spec
+++ b/java/spacewalk-java.spec
@@ -28,7 +28,7 @@ Name: spacewalk-java
Summary: Spacewalk Java site packages
Group: Applications/Internet
License: GPLv2
-Version: 1.10.110
+Version: 1.10.111
Release: 1%{?dist}
URL: https://fedorahosted.org/spacewalk
Source0: https://fedorahosted.org/releases/s/p/spacewalk/%{name}-%{version}.tar.gz
@@ -751,6 +751,9 @@ fi
%{jardir}/postgresql-jdbc.jar
%changelog
+* Tue Jul 02 2013 Tomas Kasparek <tkasparek(a)redhat.com> 1.10.111-1
+- checkstyle fix
+
* Tue Jul 02 2013 Tomas Kasparek <tkasparek(a)redhat.com> 1.10.110-1
- updating strings to use @@PRODUCT_NAME@@ macro
- 834214 - do not validate input when it's not needed
diff --git a/rel-eng/packages/spacewalk-java b/rel-eng/packages/spacewalk-java
index 5fe7185..54f61bb 100644
--- a/rel-eng/packages/spacewalk-java
+++ b/rel-eng/packages/spacewalk-java
@@ -1 +1 @@
-1.10.110-1 java/
+1.10.111-1 java/
10 years, 10 months
java/code
by Tomáš Kašpárek
java/code/src/com/redhat/rhn/frontend/action/systems/virtualization/VirtualGuestsListAction.java | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
New commits:
commit a91640c3dfcc4956c773ae66d3564b2b640967ff
Author: Tomas Kasparek <tkasparek(a)redhat.com>
Date: Tue Jul 2 16:12:23 2013 +0200
checkstyle fix
diff --git a/java/code/src/com/redhat/rhn/frontend/action/systems/virtualization/VirtualGuestsListAction.java b/java/code/src/com/redhat/rhn/frontend/action/systems/virtualization/VirtualGuestsListAction.java
index 327c01f..ab64822 100644
--- a/java/code/src/com/redhat/rhn/frontend/action/systems/virtualization/VirtualGuestsListAction.java
+++ b/java/code/src/com/redhat/rhn/frontend/action/systems/virtualization/VirtualGuestsListAction.java
@@ -137,8 +137,8 @@ public class VirtualGuestsListAction extends BaseSystemListAction {
params = makeParamMap(formIn, request);
ActionErrors errors = RhnValidationHelper.validateDynaActionForm(this,
(DynaActionForm)formIn);
- if (!errors.isEmpty() && (dispatchAction.equals("setVcpu")
- || dispatchAction.equals("setMemory"))) {
+ if (!errors.isEmpty() && (dispatchAction.equals("setVcpu") ||
+ dispatchAction.equals("setMemory"))) {
strutsDelegate.saveMessages(request, errors);
return strutsDelegate.forwardParams(
mapping.findForward(RhnHelper.DEFAULT_FORWARD), params);
10 years, 10 months