fix noreverse option to register job

[Description] noreverse was not working in register job

Change-Id: I603d1e16f9ee9abc9a0eafadbc53fedbe978ed30
Signed-off-by: Hyoun Jiil <jiil.hyoun@samsung.com>

diff --git a/src/build_server/RegisterPackageJob.rb b/src/build_server/RegisterPackageJob.rb
index b32be61c14ff9f09ef2580bd421e8fcc5b87e4d0..2c4a5f6202cf6e516cb0f0c4b7b1a460b0cbf3a1 100644 (file)
--- a/src/build_server/RegisterPackageJob.rb
+++ b/src/build_server/RegisterPackageJob.rb
@@ -399,9 +399,11 @@ class RegisterPackageJob < CommonJob
                @log.info( "New Job #{@id} is started", Log::LV_USER)
 
                # clean build
-               if not ReverseBuildChecker.check( self, true ).empty? then
-                       raise BuildServerException.new("ERR203")
-               end
+        if not @no_reverse then
+            if not ReverseBuildChecker.check( self, true ).empty? then
+                raise BuildServerException.new("ERR203")
+            end
+        end
 
                # if this package has compatible OS, check
                if @pkg_type == "BINARY" and

diff --git a/test/build-server.basic1/build-cli-43.testcase b/test/build-server.basic1/build-cli-43.testcase
new file mode 100644 (file)
index 0000000..aa7f458
--- /dev/null
+++ b/test/build-server.basic1/build-cli-43.testcase
@@ -0,0 +1,82 @@
+#PRE-EXEC
+echo "register noreverse "
+cd git01;tar xf binary.tar.gz
+cd git01;tar xf depbinary.tar.gz
+cd git01/binary;../../../../pkg-build -u ../../pkgsvr01/unstable/
+cd git01/binary;mv *.zip ../
+sed -i "s/0.0.1/0.0.2/" git01/binary/package/pkginfo.manifest
+cd git01/binary;../../../../pkg-build -u ../../pkgsvr01/unstable/
+cd git01/binary;mv *.zip ../
+../../build-svr add-prj -n testserver3 -N depbinary -g `pwd`/git01/depbinary -b master
+../../build-svr add-prj -n testserver3 -N binary -P binary
+#EXEC
+../../build-cli register -P `ls ./git01/binary_0.0.1_*.zip` -d 127.0.0.1:2223 -U admin@user -w 1234
+../../build-cli build -N depbinary -d 127.0.0.1:2223 -U admin@user -w 1234 
+../../build-cli register -P `ls ./git01/binary_0.0.2_*.zip` -d 127.0.0.1:2223 -U admin@user -w 1234 --noreverse
+#POST-EXEC
+#EXPECT
+I, [
+I, [
+I, [
+I, [
+I, [
+I, [
+Info: Added new job
+Info: Initializing job...
+Info: Checking package version ...
+Info: Invoking a thread for REGISTER Job
+Info: New Job
+Info: Checking reverse build dependency ...
+Info: Uploading ...
+Info: Upload succeeded. Sync local pkg-server again...
+Info: Snapshot:
+Info: Job is completed!
+Info: Job is FINISHED successfully!
+Info: Updating the source info for project "binary"
+Info: Added new job
+Info: Initializing job...
+Info: Checking package version ...
+Info: Invoking a thread for building Job
+Info: New Job
+Info: Checking build dependency ...
+Info: Checking install dependency ...
+Info: Started to build this job...
+Info: JobBuilder#
+Info: Downloding client is initializing...
+Info: Installing dependent packages...
+Info:  * binary
+Info: Wait for cache sync
+Info: Entering cache sync
+Info: Cache sync done
+Info: Downloading dependent source packages...
+Info: Make clean...
+Info: Make build...
+Info: Make install...
+Info: Generatiing pkginfo.manifest...
+Info: Zipping...
+Info: Creating package file ... depbinary_0.0.1_
+Info: Checking reverse build dependency ...
+Info: Uploading ...
+Info: Upload succeeded. Sync local pkg-server again...
+Info: Snapshot:
+Info: Job is completed!
+Info: Job is FINISHED successfully!
+Info: Updating the source info for project "depbinary"
+I, [
+I, [
+I, [
+I, [
+I, [
+I, [
+Info: Added new job
+Info: Initializing job...
+Info: Checking package version ...
+Info: Invoking a thread for REGISTER Job
+Info: New Job
+Info: Uploading ...
+Info: Upload succeeded. Sync local pkg-server again...
+Info: Snapshot:
+Info: Job is completed!
+Info: Job is FINISHED successfully!
+Info: Updating the source info for project "binary"
+

diff --git a/test/build-server.basic1/testsuite b/test/build-server.basic1/testsuite
index 39bb88d67b8b9a191b542dc18707ab71239588d4..dc7390258822fdd57181937468fb711be72f1f24 100644 (file)
--- a/test/build-server.basic1/testsuite
+++ b/test/build-server.basic1/testsuite
@@ -40,3 +40,4 @@ build-cli-39.testcase
 build-cli-40.testcase
 build-cli-41.testcase
 build-cli-42.testcase
+build-cli-43.testcase

diff --git a/test/git01/binary.tar.gz b/test/git01/binary.tar.gz
new file mode 100644 (file)
index 0000000..75fdeb2
Binary files /dev/null and b/test/git01/binary.tar.gz differ

diff --git a/test/git01/depbinary.tar.gz b/test/git01/depbinary.tar.gz
new file mode 100644 (file)
index 0000000..08d6d0d
Binary files /dev/null and b/test/git01/depbinary.tar.gz differ