ADBDEV-4015 2.2.2 sync

CMakeLists.txt

@@ -91,8 +91,21 @@ include(${CMAKE_CURRENT_SOURCE_DIR}/cmake/Distro.cmake)
 if(DEFINED DISKQUOTA_LAST_RELEASE_PATH)
   message(STATUS "Copy pervious installer from ${DISKQUOTA_LAST_RELEASE_PATH}")
   file(ARCHIVE_EXTRACT INPUT ${DISKQUOTA_LAST_RELEASE_PATH} PATTERNS "*.so")
-  file(GLOB DISKQUOTA_PREVIOUS_LIBRARY
+  file(GLOB so_files_list
        "${CMAKE_BINARY_DIR}/lib/postgresql/*.so")
+
+  foreach(so_path IN LISTS so_files_list)
+    get_filename_component(so_name ${so_path} NAME_WLE)
+    # Replace 'diskquota-x.y' with 'x.y'. 'diskquota' won't be replaced, which belongs to 1.x release.
+    string(REPLACE "diskquota-" "" so_ver ${so_name})
+    # Install the previous so files. Those so files have versions less than current version.
+    # diskqutoa.so doesn't have version string in the file name. It belongs to 1.x release.
+    if((${so_ver} STREQUAL "diskquota") OR
+      ${so_ver} VERSION_LESS ${DISKQUOTA_MAJOR_VERSION}.${DISKQUOTA_MINOR_VERSION})
+      list(APPEND DISKQUOTA_PREVIOUS_LIBRARY ${so_path})
+    endif()
+  endforeach()
+
   install(PROGRAMS ${DISKQUOTA_PREVIOUS_LIBRARY} DESTINATION "lib/postgresql/")
 
   get_filename_component(

VERSION

@@ -1 +1 @@
-2.2.1
+2.2.2

concourse/PROJ_NAME

@@ -0,0 +1 @@
+diskquota

concourse/README.md

@@ -81,6 +81,14 @@ To test if the webhook works, use `curl` to send a `POST` request to the hook UR
 curl --data-raw "foo" <hook_url>
 ```
 
+## Update gp-extensions-ci
+
+We place some of the resources of concourse in a separate repository https://github.com/pivotal/gp-extensions-ci/. And we use that repo as a subtree with prefix ./concourse/lib. This is how to pull from the repo gp-extensions-ci:
+
+```sh
+  git subtree pull --prefix concourse/lib git@github.com:pivotal/gp-extensions-ci.git main --squash
+```
+
 # FAQ
 
 ## PR pipeline is not triggered.

concourse/fly.sh

@@ -0,0 +1 @@
+lib/fly.sh

concourse/lib/README.md

@@ -0,0 +1 @@
+# Common ytt libs for gp-extensions concourse

concourse/pipeline/base.lib.yml → concourse/lib/base.lib.yml

@@ -1,4 +1,23 @@
 #@ load("@ytt:data", "data")
+#@ load("@ytt:struct", "struct")
+
+#! resources and resource_types could be declared in different data-value files.
+#! We check the key prefix, if they are 'resources' and 'resource_types', just
+#! merge them into local dictionaries.
+#@ resources = []
+#@ resource_types = []
+#@ data_values_dict = struct.decode(data.values)
+#@ for key in data_values_dict.keys():
+#@   if key.startswith('resources'):
+#@     resources.extend(data_values_dict[key])
+#@   end
+#@ end
+#@ for key in data_values_dict.keys():
+#@   if key.startswith('resource_type'):
+#@     resource_types.extend(data_values_dict[key])
+#@   end
+#@ end
+
 #! add_res_by_xxx is to solve the unused resources error for concourse
 #@ def add_res_by_conf(res_map, job_conf):
 #@   for key in job_conf:
@@ -21,7 +40,7 @@
 #@ end
 #@
 #@ def declare_res(res_type_map, res_map):
-#@   for val in data.values.resources:
+#@   for val in resources:
 #@     res_name = val["name"]
 #@     res_type = val["type"]
 #@     if res_map.get(val["name"]):
@@ -32,7 +51,7 @@
 #@ end
 #@
 #@ def declare_res_type(res_type_map):
-#@   for val in data.values.resource_types:
+#@   for val in resource_types:
 #@     type_name = val["name"]
 #@     if res_type_map.get(type_name):
   - #@ val