Improve basic CI and installcheck CI code.

Author: danolivo

./workflows/c-cpp.yml

@@ -15,7 +15,6 @@ jobs:
 - uses: actions/checkout@v3
 - name: "Define PostreSQL major version"
 run: |
-echo "$(ls -la)"
 _name=$(ls aqo_*.|tail -1)
 echo "CORE__NAME=$_name" >> $_ENV
 
@@ -49,7 +48,6 @@ jobs:
 run: |
 git clone -b $PG_BRANCH --depth=1 --single-branch https://.com/postgres/postgres.git $_WORKSPACE/../pg
 cd $_WORKSPACE/../pg
-ls -la
 cp -r ../aqo contrib/aqo
 -p1 --no-backup-if-mismatch < contrib/aqo/$CORE__NAME
 
@@ -70,7 +68,7 @@ jobs:
 env CLIENTS=50 THREADS=50 make -C contrib/aqo check
 
  - name: Archive artifacts
-if: ${{ always() }}
+if: ${{ failure() }}
 uses: actions/upload-artifact@v3
 with:
 name: make_check_logs

./workflows/installchecks.yml

@@ -14,66 +14,68 @@ jobs:
 steps:
 
 # Set major PostgreSQL version for all underlying steps
-- name: "Extract Postgres major version number"
+- uses: actions/checkout@v3
+- name: "Define PostreSQL major version"
 run: |
-PG_MAJOR_VERSION=$(echo "$BRANCH_NAME" | grep --only-matching 'stable[0-9].' | grep --only-matching '[0-9].')
+_name=$(ls aqo_*.|tail -1)
+echo "CORE__NAME=$_name" >> $_ENV
 
-# Declare PG_MAJOR_VERSION as a environment variable
-echo "PG_MAJOR_VERSION=$PG_MAJOR_VERSION" >> $_ENV
-echo "CORE_BRANCH_NAME=REL_${PG_MAJOR_VERSION}_STABLE" >> $_ENV
-echo "AQO__NAME=aqo_pg$PG_MAJOR_VERSION." >> $_ENV
- - name: "Set proper names for the master case"
+# we can get number, otherwise set up master
+vers_number=$(echo "$_name"|tr -d -c 0-9)
+echo "PG_MAJOR_VERSION=$vers_number" >> $_ENV
+
+branch_name="REL_${vers_number}_STABLE"
+echo "PG_BRANCH=$branch_name" >> $_ENV
+
+ - name: "Set master branch name, if needed"
 if: env.PG_MAJOR_VERSION == ''
 run: |
-echo "PG_MAJOR_VERSION=master" >> $_ENV
-echo "CORE_BRANCH_NAME=master" >> $_ENV
-echo "AQO__NAME=aqo_master." >> $_ENV
+branch_name="master"
+echo "PG_BRANCH=$branch_name" >> $_ENV
 
- - name: "Preparations"
+ - name: "Environment (debug output)"
+if: ${{ always() }}
 run: |
-sudo apt install libipc-run-perl libxml2-utils libxml2-dev xsltproc libxslt1-dev
-
-echo "Deploying to production server on branch" $BRANCH_NAME
+echo "Use PostgreSQL branch $PG_BRANCH (: $CORE__NAME)"
+echo "Deploying to production server on branch" $BRANCH_NAME "(PG $PG_BRANCH)"
 git config --global user.email "[email protected]"
 git config --global user.name "CI PgPro admin"
-git clone https://.com/postgres/postgres.git pg
-cd pg
-git checkout $CORE_BRANCH_NAME
-git clone https://.com/postgrespro/aqo.git contrib/aqo
-git -C contrib/aqo checkout $BRANCH_NAME
--p1 --no-backup-if-mismatch < contrib/aqo/$AQO__NAME
-COPT="-Werror"
-CONFIGURE_OPTS="--prefix=`pwd`/tmp_install --enable-tap-tests --enable-cassert"
-echo "CONFIGURE_OPTS=$CONFIGURE_OPTS" >> $_ENV
-echo "COPT=$COPT" >> $_ENV
+
+ - name: "Prepare PG directory"
+run: |
+sudo apt install libipc-run-perl libxml2-utils libxml2-dev xsltproc libxslt1-dev
+git clone -b $PG_BRANCH --depth=1 --single-branch https://.com/postgres/postgres.git $_WORKSPACE/../pg
+cd $_WORKSPACE/../pg
+cp -r ../aqo contrib/aqo
+-p1 --no-backup-if-mismatch < contrib/aqo/$CORE__NAME
 
  - name: "Paths"
 run: |
-echo "$_WORKSPACE/pg/contrib/aqo/./scripts/job" >> $_PATH
-ls -la pg/contrib/aqo/./scripts/job
-echo "$_WORKSPACE/pg/tmp_install/bin" >> $_PATH
+cd $_WORKSPACE/../pg
+echo "COPT=-Werror" >> $_ENV
+echo "CONFIGURE_OPTS=--prefix=`pwd`/tmp_install --enable-tap-tests --enable-cassert" >> $_ENV
+echo "$_WORKSPACE/../pg/tmp_install/bin" >> $_PATH
+echo "$_WORKSPACE/../pg/contrib/aqo/./scripts/job" >> $_PATH
 echo "LD_LIBRARY_PATH=$_WORKSPACE/pg/tmp_install/lib" >> $_ENV
 echo "PGDATABASE=`whoami`" >> $_ENV
 echo "PGHOST=localhost" >> $_ENV
 echo "PGDATA=PGDATA" >> $_ENV
 echo "PGUSER=`whoami`" >> $_ENV
 echo "PGPORT=5432" >> $_ENV
 
- - name: "Debug"
-run: |
-echo "paths: $PATH"
-echo "PG_MAJOR_VERSION: $PG_MAJOR_VERSION, CORE_BRANCH_NAME: $CORE_BRANCH_NAME, AQO__NAME: $AQO__NAME, CONFIGURE_OPTS: $CONFIGURE_OPTS"
-
  - name: "Compilation"
 run: |
-cd pg
-./configure $CONFIGURE_OPTS CFLAGS="-O2"
+cd $_WORKSPACE/../pg
+echo "paths: $PATH"
+echo "COPT: $COPT"
+echo "CONFIGURE_OPTS: $CONFIGURE_OPTS"
+./configure $CONFIGURE_OPTS CFLAGS="-O2" > /dev/null
 make -j4 > /dev/null && make -j4 -C contrib > /dev/null
 make install >> make.log && make -C contrib install > /dev/null
 
  - name: "Launch AQO instance"
 run: |
-cd pg
+cd $_WORKSPACE/../pg
 
 # Launch an instance with AQO extension
 aqo_instance_launch.sh
@@ -84,29 +86,29 @@ jobs:
  # Pass installcheck in disabled mode
 - name: installcheck_disabled
 run: |
-cd pg
+cd $_WORKSPACE/../pg
 psql -c "ALTER SYSTEM SET aqo.force_collect_stat = 'off'"
 psql -c "SELECT pg_reload_conf()"
 make installcheck-world
 
  - name: installcheck_disabled_forced_stat
 run: |
-cd pg
+cd $_WORKSPACE/../pg
 psql -c "ALTER SYSTEM SET aqo.force_collect_stat = 'on'"
 psql -c "SELECT pg_reload_conf()"
 make installcheck-world
 
  - name: installcheck_frozen
 run: |
-cd pg
+cd $_WORKSPACE/../pg
 psql -c "ALTER SYSTEM SET aqo.mode = 'frozen'"
 psql -c "ALTER SYSTEM SET aqo.force_collect_stat = 'on'"
 psql -c "SELECT pg_reload_conf()"
 make installcheck-world
 
  - name: installcheck_controlled
 run: |
-cd pg
+cd $_WORKSPACE/../pg
 psql -c "ALTER SYSTEM SET aqo.mode = 'controlled'"
 psql -c "ALTER SYSTEM SET aqo.force_collect_stat = 'on'"
 psql -c "SELECT pg_reload_conf()"
@@ -115,7 +117,7 @@ jobs:
  - name: installcheck_learn
 continue-on-error: true
 run: |
-cd pg
+cd $_WORKSPACE/../pg
 psql -c "ALTER SYSTEM SET aqo.mode = 'learn'"
 psql -c "ALTER SYSTEM SET aqo.force_collect_stat = 'on'"
 psql -c "SELECT pg_reload_conf()"
@@ -124,7 +126,7 @@ jobs:
  - name: installcheck_intelligent
 continue-on-error: true
 run: |
-cd pg
+cd $_WORKSPACE/../pg
 psql -c "ALTER SYSTEM SET aqo.mode = 'intelligent'"
 psql -c "ALTER SYSTEM SET aqo.force_collect_stat = 'on'"
 psql -c "SELECT pg_reload_conf()"
@@ -133,18 +135,18 @@ jobs:
  - name: installcheck_forced
 continue-on-error: true
 run: |
-cd pg
+cd $_WORKSPACE/../pg
 psql -c "ALTER SYSTEM SET aqo.mode = 'forced'"
 psql -c "ALTER SYSTEM SET aqo.force_collect_stat = 'on'"
 psql -c "SELECT pg_reload_conf()"
 make -k installcheck-world
 
  # Save Artifacts
 - name: Archive artifacts
-if: ${{ failure() }}
+if: ${{ always() }}
 uses: actions/upload-artifact@v3
 with:
-name: ${{ env.AQO_VERSION }}-${{ env.CORE_BRANCH_NAME }}-${{ env.BRANCH_NAME }}-artifacts
+name: ${{ env.AQO_VERSION }}-${{ env.PG_BRANCH }}-${{ env.CORE__NAME }}-artifacts
 path: |
 pg/src/test/regress/regression.diffs
 pg/logfile.log

regress_schedule

@@ -15,6 +15,7 @@ test: plancache
 test: update_functions
 # Performance-dependent test. Can be ignored if executes in containers or on slow machines
 ignore: statement_timeout
+test: statement_timeout
 test: temp_tables
 test: top_queries
 test: relocatable