extras-buildsys-temp/automation2/client archwelder.py, 1.5, 1.6 archwelder_config.py, 1.2, 1.3

[Seth Vidal (skvidal)]

Author: skvidal

Update of /cvs/fedora/extras-buildsys-temp/automation2/client
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29873

Modified Files:
	archwelder.py archwelder_config.py 
Log Message:

modify the archwelder to use mock instead of mach



Index: archwelder.py
===================================================================
RCS file: /cvs/fedora/extras-buildsys-temp/automation2/client/archwelder.py,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- archwelder.py	22 May 2005 05:10:57 -0000	1.5
+++ archwelder.py	28 May 2005 18:01:57 -0000	1.6
@@ -64,52 +64,27 @@
         self._status = 'killed'
         return True
 
-    def _unlock(self):
-        print "%s: starting step 'unlocking'" % self.uniqid
-        cmd = '%s %s -r %s unlock' % (self.arch_command,
-                            CONFIG('mach_cmd'), self.buildroot)
-        self.pobj = popen2.Popen4(cmd=cmd)
-        self._status = 'unlocking'
-
-    def _clean(self):
-        print "%s: starting step 'cleaning'" % self.uniqid
-        cmd = '%s %s -r %s clean' % (self.arch_command,
-                            CONFIG('mach_cmd'), self.buildroot)
-        self.pobj = popen2.Popen4(cmd=cmd)
-        self._status = 'cleaning'
-        
-    
-    def _prep(self):
-        print "%s: starting step 'prepping'" % self.uniqid
-        cmd = '%s /%s -r %s setup prep' % (self.arch_command,
-                            CONFIG('mach_cmd'), self.buildroot)
-        self.pobj = popen2.Popen4(cmd=cmd)
-        self._status = 'prepping'
         
     def _build(self):
         print "%s: starting step 'building'" % self.uniqid
-        os.chdir(self.mydir + '/' + self.buildarch)
-        cmd = '%s %s -r %s -c rebuild %s' % (self.arch_command,
-                            CONFIG('mach_cmd'), self.buildroot, self.srpm)
+        resultdir = self.mydir + '/' + self.buildarch
+        cmd = '%s %s -r %s --resultdir=%s rebuild %s' % (self.arch_command,
+                            CONFIG('builder_cmd'), self.buildroot, 
+                            resultdir, self.srpm)
         self.pobj = popen2.Popen4(cmd=cmd)
         self._status = 'building'
 
     def start(self):
         # check for existence of srpm before going on
-        self._unlock()
+        pass
 
     def process(self):
         if not is_done_status(self._status):
             # If we're done with a step, advance to next one
             exit_status = self.pobj.poll()
             if exit_status == 0:
-                if self._status == 'unlocking':
-                    self._clean()
-                elif self._status == 'cleaning':
-                    self._prep()
-                elif self._status == 'prepping':
-                    self._build()
-                elif self._status == 'building':
+                self._build()
+                if self._status == 'building':
                     # TODO: Should have 'moving' stage
                     # where files are copied to the directory
                     # that fileserver.py looks in.
@@ -121,7 +96,7 @@
                 print "%s: job failed!\n" % self.uniqid
                 self._status = 'failed'
             else:
-                # mach process still running
+                # mock process still running
                 pass
 
     def status(self):


Index: archwelder_config.py
===================================================================
RCS file: /cvs/fedora/extras-buildsys-temp/automation2/client/archwelder_config.py,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- archwelder_config.py	22 May 2005 05:10:57 -0000	1.2
+++ archwelder_config.py	28 May 2005 18:01:57 -0000	1.3
@@ -1,7 +1,7 @@
 # Configuration file for archwelder.py
 
 config_opts = {}
-config_opts['mach_cmd'] = "/usr/bin/mach"
+config_opts['builder_cmd'] = "/usr/bin/mock"
 config_opts['distro_name'] = "fedora"
 config_opts['repo_name'] = "core"
 config_opts['built_rpm_download_basedir'] = "/tmp"