fix the script for ASF build

builddeb.sh

@@ -9,12 +9,14 @@ params="$@"
 # Build debs
 cd "$GIT_SOURCE_DIR"
 if [ "$USE_WAF" == "True" ]; then
-    ./waf deb $params
+    mvn build-helper:remove-project-artifact
+    mvn install  -P deps
+    dpkg-buildpackage
     debs="artifacts/debbuild/"
 else
     true
 fi
 cd -
 
 # write down the path to deb files to file
-echo "$GIT_SOURCE_DIR"/"$debs" > "$RESULT_DIR"
+echo "$GIT_SOURCE_DIR"/"$debs" > "$RESULT_DIR"

builddebtarball.sh

@@ -20,13 +20,9 @@ fi
 tmpdir=`mktemp -d`
 destdir=$tmpdir/$pkgname
 tarname=$pkgname.tar.gz
-debDir=`cat $RESULT_DIR`
+debDir='source/artifacts/debbuild'
 mkdir -p "$tmpdir"
-rsync -a "$debDir"/oss "$destdir"/
-if [ "$oss" != "True" && x"$NO_PROPIRETARY" != x"true" ]; then
-    rsync -a "$debDir"/premium "$destdir"/
-fi
-rsync -a "$DEPS_DIR" "$destdir"/
+rsync -a ./*.deb "$destdir"/
 cd "$destdir"
 dpkg-scanpackages . /dev/null | gzip -9c > Packages.gz
 cd -
@@ -37,14 +33,4 @@ tar czf "$tarname" "$pkgname"
 cd -
 mv "$tmpdir"/"$tarname" .
 rm -rf "$tmpdir"
-
-tgtfldr="$APTREPO":"$APTREPO_RELEASE_DIR"/"$SUB_DIR"
-mntpoint="/media"
-mount "$tgtfldr" "$mntpoint" -o nolock
-mkdir -p "$mntpoint"/"$PUSH_TO_REPO"
-mv "$tarname" "$mntpoint"/"$PUSH_TO_REPO"/
-echo "Tarball URL:http://aptrepo.lab.vmops.com/releases/$SUB_DIR/$PUSH_TO_REPO/$tarname"
-umount "$mntpoint"
-
-
-
+rm -rf ./*.deb

buildrpm.sh

@@ -8,6 +8,8 @@ params="$@"
 # Build rpms
 pushd "$GIT_SOURCE_DIR"
 if [ "$USE_WAF" == "True" ]; then
+   mvn build-helper:remove-project-artifact
+   mvn install  -P deps
    ./waf rpm $params
    rpms="artifacts/rpmbuild/RPMS"
 else
@@ -16,4 +18,4 @@ fi
 popd
 
 # write down the path to rpm files to file
-echo "$GIT_SOURCE_DIR"/"$rpms" > "$RESULT_DIR"
+echo "$GIT_SOURCE_DIR"/"$rpms" > "$RESULT_DIR"

buildrpmtarball.sh

@@ -15,9 +15,9 @@ shift
 s3repo="$1"
 
 if [ x"$PACKAGE_NAME" != "x" ]; then
-	pkgname=$tarballname-$version-$PACKAGE_NAME-$distro
+        pkgname=$tarballname-$version-$PACKAGE_NAME-$distro
 else
-	pkgname=$tarballname-$version-$distro
+        pkgname=$tarballname-$version-$distro
 fi
 
 tmpdir=`mktemp -d`
@@ -26,11 +26,7 @@ tarname=$pkgname.tar.gz
 rpmDir=`cat $RESULT_DIR`
 
 mkdir -p "$tmpdir"
-rsync -a "$rpmDir"/oss "$destdir"/
-if [ "$oss" != "True" && x"$NO_PROPIRETARY" != x"true" ]; then
-	rsync -a "$rpmDir"/premium "$destdir"/
-fi
-rsync -a "$DEPS_DIR" "$destdir"/
+rsync -a "$rpmDir" "$destdir"/
 createrepo -q -d "$destdir"
 chmod +x install.sh
 cp install.sh "$destdir"/
@@ -39,14 +35,3 @@ tar czf "$tarname" "$pkgname"
 popd
 mv "$tmpdir"/"$tarname" .
 rm -rf "$tmpdir"
-
-tgtfldr="$YUMREPO":"$YUMREPO_RELEASE_DIR"/"$SUB_DIR"
-mntpoint="/media"
-mount "$tgtfldr" "$mntpoint" -o nolock
-mkdir -p "$mntpoint"/"$PUSH_TO_REPO"
-if [ x"$s3repo" != x"" ]; then
-	s3cmd put --acl-public "$tarname" "$s3repo"
-fi
-mv "$tarname" "$mntpoint"/"$PUSH_TO_REPO"/
-echo "Tarball URL:http://yumrepo.lab.vmops.com/releases/$SUB_DIR/$PUSH_TO_REPO/$tarname"
-umount "$mntpoint"

client.py

@@ -100,10 +100,10 @@ def arrageResult(ext):
 
     if isDeb():
         buildDeb()
-        arrageResult(".deb")
+        #arrageResult(".deb")
     else:
         buildRpm()
-        arrageResult(".rpm")
+        #arrageResult(".rpm")
 
 
 def buildTarball():

clone.sh

@@ -1,3 +1,4 @@
+#!/bin/bash
 # Checkout $GIT_SOURCE_DIR from git
 
 . `dirname $0`/commons.sh
@@ -19,7 +20,7 @@ if [ -d $GIT_SOURCE_DIR ] ; then
     else osscommitid=`git checkout $BUILDABLE_TARGET &>commit.log;cat commit.log; rm -f commit.log` ; fi
   	popd
 else
-  git clone ssh://hudson@git.cloud.com/var/lib/git/cloudstack-oss $GIT_SOURCE_DIR
+  git clone https://git-wip-us.apache.org/repos/asf/incubator-cloudstack.git $GIT_SOURCE_DIR
   #git clone https://github.com/CloudDotCom/CloudStack.git "$$GIT_SOURCE_DIR"
 fi
 

common.py

@@ -76,4 +76,4 @@ def FormatErrMsg(e):
 YUM_RPM_DIR='/var/www/html/repositories'
 APT_DEB_DIR='/var/www/html/repositories'
 YUM_RELEASE_DIR='/var/www/html/releases'
-APT_RELEASE_DIR='/var/www/html/releases'
+APT_RELEASE_DIR='/var/www/html/releases'

hudsonbuild.py

@@ -11,9 +11,9 @@
   "fedora14": {"host":"build-fc14", "isDeb":False, "subDir":"fedora/14"},
   "fedora13": {"host":"build-fc13", "isDeb":False, "subDir":"fedora/13"},
   "rhel6.0": {"host":"build-rhel6", "isDeb":False, "subDir":"rhel/6.0"},
-  "rhel6.1": {"host":"build-rhel6", "isDeb":False, "subDir":"rhel/6.1"},
+  "rhel6.3": {"host":"rhel63", "isDeb":False, "subDir":"rhel/6.3"},
   "ubuntu10.10": {"host":"build-ubuntu1010", "isDeb":True, "subDir":"ubuntu/10.10"},
-  "ubuntu10.04" : {"host":"build-ubuntu1004", "isDeb":True, "subDir":"ubuntu/10.04"},
+  "ubuntu12.04" : {"host":"ubuntu1204", "isDeb":True, "subDir":"ubuntu/10.04"},
   #"ubuntu11" : {"host":"natty", "isDeb":True,"subDir":"ubuntu/11" },
 }
 
@@ -288,8 +288,15 @@ def waitForAllThreadsEnd():
 
     waitForAllThreadsStart(processNum)
     waitForAllThreadsEnd()
-    sendMail()
+    #sendMail()
+    grabartifacts()
 
+def grabartifacts():
+    distro=os.environ['DO_DISTRO_PACKAGES']
+    host = buildMachines[distro]['host']
+    remoteHost = '%s@%s'%(REMOTE_USER, host)
+    bash(['scp', '%s:%s/*.tar.gz'%(remoteHost, BUILD_DIR), "$WORKSPACE/"])
+    bash(['ssh', remoteHost, '"rm -rf %s/*.tar.gz"'%BUILD_DIR])
 if __name__ == '__main__':
     try:
         main()

install/rpminstall_full.sh

@@ -1,4 +1,21 @@
-#!/bin/bash -e
+#!/bin/bash
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
 function cleanup() {
     rm -f /etc/yum.repos.d/cloud-temp.repo || true
 }

postdebs.sh

@@ -1,12 +1,3 @@
 #!/bin/bash
 . `dirname $0`/commons.sh
 
-debsDir=`cat $RESULT_DIR`
-tgtfldr="$APTREPO":"$APTREPO_DEB_DIR"/"$SUB_DIR"
-mntpoint="/media"
-mount "$tgtfldr" "$mntpoint" -o nolock
-repoDir="$mntpoint"/"$PUSH_TO_REPO"
-mkdir -p "$repoDir"
-cp -r "$debsDir"/oss "$repoDir"
-cp -r "$debsDir"/premium "$repoDir"
-umount "$mntpoint"

postrpms.sh

@@ -2,14 +2,3 @@
 
 . `dirname $0`/commons.sh
 
-rpmsDir=`cat $RESULT_DIR`
-tgtfldr="$YUMREPO":"$YUMREPO_RPM_DIR"/"$SUB_DIR"
-mntpoint="/media"
-mount "$tgtfldr" "$mntpoint" -o nolock
-repoDir="$mntpoint"/"$PUSH_TO_REPO"
-mkdir -p "$repoDir"
-cp -r "$rpmsDir"/oss "$repoDir"
-createrepo -q -d --update "$repoDir"/oss
-cp -r "$rpmsDir"/premium "$repoDir"
-createrepo -q -d --update "$repoDir"/premium
-umount "$mntpoint"