[csw-devel] SF.net SVN: opencsw:[392] buildfarm/bin

[dmichelsen at users.sourceforge.net]

Revision: 392
          http://opencsw.svn.sourceforge.net/opencsw/?rev=392&view=rev
Author:   dmichelsen
Date:     2011-07-15 14:26:49 +0000 (Fri, 15 Jul 2011)

Log Message:
-----------
dublin: Updated catalog generation scripts

Modified Paths:
--------------
    buildfarm/bin/generate-unstable
    buildfarm/bin/opencsw-future-update
    buildfarm/bin/sync-checkpkg

Modified: buildfarm/bin/generate-unstable
===================================================================
--- buildfarm/bin/generate-unstable	2011-07-12 13:25:48 UTC (rev 391)
+++ buildfarm/bin/generate-unstable	2011-07-15 14:26:49 UTC (rev 392)
@@ -11,35 +11,45 @@
 set -e
 set -x
 
-/home/web/bin/gar/bin/pkgdb \
-    gen-cat --catalog-release unstable \
-    /home/mirror/opencsw-future/allpkgs /home/mirror/opencsw-future
+declare -r catalogs=( "unstable" "dublin" )
+declare -r os_rels=( "5.9" "5.10" "5.11" )
 
-pushd /home/mirror/opencsw-future/unstable
-for arch in i386 sparc; do
-  pushd "${arch}"
-  for osrel in 5.9 5.10 5.11; do
-    pushd "${osrel}"
-      # bldcat prints a lot of output
-      if ! bldcat --fast . >/dev/null
-      then
-        echo "bldcat failed in $(pwd)."
-        false
-      fi
-      if chkcat -e catalog
-      then
-        echo chkcat returned no errors
-      else
-      	r="$?"
-      	if [[ "${r}" -eq 2 ]]; then
-          echo "chkcat returned an error in $(pwd)."
+for catalog in "${catalogs[@]}"
+do
+  /home/web/bin/gar/bin/pkgdb \
+      gen-cat --catalog-release "${catalog}" \
+      /home/mirror/opencsw-future/allpkgs \
+      /home/mirror/opencsw-future
+
+  pushd "/home/mirror/opencsw-future/${catalog}"
+  for arch in i386 sparc; do
+  	mkdir -p "${arch}"
+    pushd "${arch}"
+    for osrel in "${os_rels[@]}"; do
+    	mkdir -p "${osrel}"
+      pushd "${osrel}"
+        # bldcat prints a lot of output
+        if ! bldcat --fast . >/dev/null
+        then
+          echo "bldcat failed in $(pwd)."
           false
         fi
-      fi
+        if chkcat -e --nocyclic catalog
+        then
+          echo chkcat returned no errors
+        else
+          r="$?"
+          if [[ "${r}" -eq 2 ]]; then
+            echo -n "chkcat returned an error in $(pwd) "
+            echo "when generating ${catalog}."
+            false
+          fi
+        fi
+      popd
+    done
     popd
   done
   popd
 done
-popd
 
 # vim:set ci si ts=2 sts=2 sw=2 expandtab:

Modified: buildfarm/bin/opencsw-future-update
===================================================================
--- buildfarm/bin/opencsw-future-update	2011-07-12 13:25:48 UTC (rev 391)
+++ buildfarm/bin/opencsw-future-update	2011-07-15 14:26:49 UTC (rev 392)
@@ -10,9 +10,12 @@
 
 ${BASE_DIR}/sync-mirror
 ${BASE_DIR}/sync-checkpkg
-${BASE_DIR}/sync-opencsw-future
+# Current is no longer synced from the official mirror.
+# ${BASE_DIR}/sync-current-in-opencsw-future
+${BASE_DIR}/make-snapshot-README
+
+# Generating unstable.
 ${BASE_DIR}/generate-unstable
-${BASE_DIR}/make-snapshot-README
 ${BASE_DIR}/push-opencsw-future
 ${BASE_DIR}/send-catalog-update-notifications
 

Modified: buildfarm/bin/sync-checkpkg
===================================================================
--- buildfarm/bin/sync-checkpkg	2011-07-12 13:25:48 UTC (rev 391)
+++ buildfarm/bin/sync-checkpkg	2011-07-15 14:26:49 UTC (rev 392)
@@ -6,5 +6,5 @@
 cd /home/web/bin/gar
 /opt/csw/bin/svn update
 
-bin/pkgdb sync-catalogs-from-tree current /export/mirror/opencsw/current
-
+echo "We no longer sync from current to the database"
+# bin/pkgdb sync-catalogs-from-tree current /export/mirror/opencsw/current


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.