Merge lp:~gnuoy/ubuntu-openstack-ci/operator-charmcraft-charms into lp:ubuntu-openstack-ci

[Liam Young]

[Aurelien Lourot (aurelien-lourot)]

review: Approve

=== modified file 'run/job-parts/osci_layerci_common.sh'
--- run/job-parts/osci_layerci_common.sh	2020-07-03 09:56:17 +0000
+++ run/job-parts/osci_layerci_common.sh	2020-08-17 13:09:31 +0000
@@ -100,7 +100,15 @@
   mkdir -p $WORKSPACE/asset/$ASSET_NAME
   tar -jxvf $WORKSPACE/asset/$ARCHIVE_NAME -C $WORKSPACE/asset/$ASSET_NAME
   ls -al $WORKSPACE/asset/$ASSET_NAME
-  export BUILT_ASSET_DIR=$WORKSPACE/asset/$ASSET_NAME
+  CHARM_ARCHIVE=$WORKSPACE/asset/$ASSET_NAME/${ASSET_NAME}.charm
+  if [[ -f $CHARM_ARCHIVE ]]; then
+    export BUILT_ASSET_DIR=$WORKSPACE/asset/$ASSET_NAME/unpacked
+    mkdir $BUILT_ASSET_DIR
+    unzip -qq $CHARM_ARCHIVE -d $BUILT_ASSET_DIR 
+    cp $CHARM_ARCHIVE $BUILT_ASSET_DIR
+  else
+    export BUILT_ASSET_DIR=$WORKSPACE/asset/$ASSET_NAME
+  fi
 }
 
 
@@ -155,6 +163,33 @@
   $UOSCI_RELEASE_TOOLS_ROOT/generate-repo-info $CO_DIR &> $BUILT_ASSET_DIR/repo-info
 }
 
+function f_layerci_build_charm_operator(){
+# Build asset (charm) based on checkout dir and base name env vars,
+# and set the built asset file env var to be consumed by jobs.
+  if [[ -z "$CO_DIR" ]]; then
+    echo " ! Missing required CO_DIR env var"
+    exit 1
+  fi
+  if [[ -z "$BASE_NAME" ]]; then
+    echo " ! Missing required BASE_NAME env var"
+    exit 1
+  fi
+  f_line "Building $CO_DIR ($BASE_NAME)"
+
+  # Build the asset
+  f_proxy_if_proxy
+  . $UOSCI_RELEASE_TOOLS_ROOT/build-charm $CO_DIR
+  f_proxy_unset
+
+  # Confirm built asset location
+  if [[ -z "$BUILT_ASSET_FILE" ]]; then
+    echo " ! Unable to determine BUILT_ASSET_FILE"
+    exit 1
+  fi
+  echo " . BUILT_ASSET_FILE: $BUILT_ASSET_FILE"
+  du -hsc $BUILT_ASSET_FILE
+}
+
 
 function f_layerci_archive_built_asset(){
 # Assumes the asset (charm) has already been built.
@@ -184,6 +219,34 @@
 }
 
 
+function f_layerci_archive_built_asset_operator(){
+# Assumes the asset (charm) has already been built.
+# Sets the properties files for later jobs to consume.
+  f_line "Archiving built asset $BUILT_ASSET_FILE as artifact"
+  if [[ -z "$BUILT_ASSET_FILE" ]]; then
+    echo " ! Missing required env var BUILT_ASSET_FILE"
+    exit 1
+  fi
+  if [[ ! -f "$BUILT_ASSET_FILE" ]]; then
+    echo " ! BUILT_ASSET_FILE does not exist"
+    exit 1
+  fi
+
+  # Create archive and make sure it exists
+  # Builds always go in workspace/build/
+  mkdir -p $WORKSPACE/build
+  export BUILT_ASSET_ARTIFACT_ARCHIVE_NAME="${BASE_NAME}-${JOB_NAME}-${BUILD_NUMBER}.tar.bz2"
+  tar -C $(dirname $BUILT_ASSET_FILE) -cjvf $WORKSPACE/build/$BUILT_ASSET_ARTIFACT_ARCHIVE_NAME $(basename $BUILT_ASSET_FILE)
+  ls -alh $WORKSPACE/build/$BUILT_ASSET_ARTIFACT_ARCHIVE_NAME
+
+  # Create properties files for parameterized job consumption. These env vars
+  # are critical to pass along for layer ci awareness in other jobs.
+  echo "BUILT_ASSET_ARTIFACT_ARCHIVE_NAME=$BUILT_ASSET_ARTIFACT_ARCHIVE_NAME" > $WORKSPACE/charm_build.properties
+  echo "BUILT_ASSET_BASE_NAME=$BASE_NAME" >> $WORKSPACE/charm_build.properties
+  echo "BUILT_ASSET_SHA1=$(cd $WORKSPACE/build; sha1sum $BUILT_ASSET_ARTIFACT_ARCHIVE_NAME)" >> $WORKSPACE/charm_build.properties
+}
+
+
 function f_layerci_build_and_archive_if_necessary() {
 # Detect asset (charm/layer/interface) type, build and archive if relevant.
 # Announce detection for clarity.  Expects CO_DIR and OSCI_ASSET_TYPE
@@ -203,6 +266,12 @@
         f_layerci_build_charm $CO_DIR
         f_layerci_archive_built_asset
         ;;
+    "charm (source operator)")
+        # Build and prepare jenkins workspace artifact for copying by other jobs
+        echo " . Proceeding with $CO_DIR as a source charm [need to build]"
+        f_layerci_build_charm_operator $CO_DIR
+        f_layerci_archive_built_asset_operator
+        ;;
     "layer")
         # Build and prepare jenkins workspace artifact for copying by other jobs
         echo " . Proceeding with $CO_DIR as a layer [need to build]"
@@ -254,13 +323,16 @@
 function f_layerci_build_if_necessary() {
     f_layerci_check_and_announce_asset_type
     case "$OSCI_ASSET_TYPE" in
-        "charm (built)"|"charm (classic)"|"bundle (func)"|"bundle (bundle_test_collection)")
+        "charm (built)"|"charm (classic)"|"bundle (func)"|"bundle (bundle_test_collection)"|"charm (built operator)")
             # OK
             :
             ;;
         "charm (source)")
             f_layerci_build_charm
             ;;
+        "charm (source operator)")
+            f_layerci_build_charm_operator
+            ;;
         *)
             #
             echo " ! Asset type not supported in this call: $OSCI_ASSET_TYPE"
@@ -280,7 +352,7 @@
   fi
 
   case "$OSCI_ASSET_TYPE" in
-    "charm (built)"|"charm (classic)"|"charm (source)"|"layer"|"interface"|"bundle (func)"|"bundle (bundle_test_collection)")
+    "charm (built)"|"charm (classic)"|"charm (source)"|"layer"|"interface"|"bundle (func)"|"bundle (bundle_test_collection)"|"charm (source operator)"|"charm (built operator)")
         # OK
         :
         ;;