ci: fix packages (#7496)

* ci: fix packages Signed-off-by: moabu <47318409+moabu@users.noreply.github.com> * ci: fix packages Signed-off-by: moabu <47318409+moabu@users.noreply.github.com> --------- Signed-off-by: moabu <47318409+moabu@users.noreply.github.com>
JanssenProject · Jan 23, 2024 · 1de2893 · 1de2893
1 parent 9ee3c8c
commit 1de2893
Show file tree

Hide file tree

Showing 9 changed files with 14 additions and 14 deletions.
diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
@@ -7,13 +7,13 @@
 /jans-keycloak-integration/ @uprightech
 /jans-keycloak-link/ @shekhar16
 /docker-jans-*/ @moabu @iromli
-/automation/ @moabu
-/charts/ @moabu
+/automation/ @moabu @iromli
+/charts/ @moabu @iromli
 /.github/ @moabu
-/jans-*/version.txt @moabu
-/jans-*/CHANGELOG.md @moabu
+/jans-*/version.txt @moabu @mo-auto
+/jans-*/CHANGELOG.md @moabu @mo-auto
 /jans-pycloudlib/ @moabu
-/docker-jans-*/requirments.txt @mo-auto
+/docker-jans-*/requirments.txt @iromli @mo-auto
 /jans-bom/ @yurem @yuriyz
 /jans-core/ @yurem @yuriyz
 /jans-orm/ @yurem @yuriyz
@@ -25,7 +25,7 @@
 /jans-config-api/ @pujavs @yuriyz @yurem
 /jans-cli-tui/ @devrimyatar
 /jans-linux-setup/ @devrimyatar @yuriyz @yurem
-/jans-linux-setup/jans_setup/setup_app/version.py @moabu
+/jans-linux-setup/jans_setup/setup_app/version.py @moabu @mo-auto
 /jans-linux-setup/static/scripts/admin_ui_plugin.py @devrimyatar @duttarnab
 /jans-cache-refresh/ @yurem @shekhar16
 /jans-link/ @shekhar16

diff --git a/.github/workflows/build-packages.yml b/.github/workflows/build-packages.yml
@@ -62,7 +62,7 @@ jobs:
          sudo add-apt-repository ppa:deadsnakes/ppa
          sudo apt-get update
          sudo apt-get install -y python${{ matrix.python_version }}
-         sudo apt install -y build-essential devscripts debhelper rpm dpkg-sig python3-dev python3-ldap3 python3-requests python3-ruamel.yaml python3-pymysql python3-crypto python3-distutils python3-prompt-toolkit python${{ matrix.python_version }}-distutils libpq-dev python${{ matrix.python_version }}-dev
+         sudo apt install -y build-essential devscripts debhelper rpm dpkg-sig python3-dev python3-ldap3 python3-requests python3-ruamel.yaml python3-pymysql python3-crypto python3-distutils python3-prompt-toolkit python${{ matrix.python_version }}-distutils libpq-dev python${{ matrix.python_version }}-dev apache2 rsyslog python3-urllib3 python3-certifi postgresql postgresql-contrib 
          sudo cp -r /usr/lib/python3/dist-packages /usr/lib/python${{ matrix.python_version }}/
          sudo python${{ matrix.python_version }} -m pip install psycopg2-binary psycopg2
     - name: Import GPG key

diff --git a/automation/packaging/deb/focal/debian/control b/automation/packaging/deb/focal/debian/control
@@ -9,5 +9,5 @@ Homepage: https://jans.io
 Package: jans
 Architecture: any
 Multi-Arch: foreign
-Depends: ${misc:Depends}, ${shlibs:Depends}, apache2, curl, wget, xz-utils, unzip, rsyslog, bzip2, python3-ldap3, python3-requests, python3-ruamel.yaml, python3-certifi, python3-pymysql, python3-crypto, python3-distutils, python3-prompt-toolkit, python3-psycopg2
+Depends: ${misc:Depends}, ${shlibs:Depends}, apache2, rsyslog, python3-urllib3, python3-certifi, postgresql, postgresql-contrib, python3-ldap3, python3-requests, python3-ruamel.yaml, python3-crypto, python3-psycopg2, curl, wget, xz-utils, unzip, rsyslog, bzip2
 Description: Janssen enables organizations to build a scalable centralized authentication and authorization service using free open source software.
diff --git a/automation/packaging/deb/focal/debian/copyright b/automation/packaging/deb/focal/debian/copyright
@@ -3,5 +3,5 @@ Upstream-Name: jans
 Source: https://jans.io
 
 Files:     *
-Copyright: 2023 The Janssen Project. support@jans.io
+Copyright: 2024 The Janssen Project. support@jans.io
 License:   Apache-2.0
diff --git a/automation/packaging/deb/jammy/debian/control b/automation/packaging/deb/jammy/debian/control
@@ -9,5 +9,5 @@ Homepage: https://jans.io
 Package: jans
 Architecture: any
 Multi-Arch: foreign
-Depends: ${misc:Depends}, ${shlibs:Depends}, apache2, curl, wget, xz-utils, unzip, rsyslog, bzip2, python3-urllib3, python3-certifi, python3-ldap3, python3-requests, python3-ruamel.yaml, python3-pymysql, python3-cryptography, python3-distutils, python3-psycopg2
+Depends: ${misc:Depends}, ${shlibs:Depends}, apache2, curl, wget, xz-utils, unzip, rsyslog, bzip2, python3-urllib3, python3-certifi, python3-ldap3, python3-requests, python3-ruamel.yaml, python3-pymysql, python3-cryptography, python3-distutils, python3-psycopg2, postgresql-contrib, postgresql
 Description: Janssen enables organizations to build a scalable centralized authentication and authorization service using free open source software.
diff --git a/automation/packaging/deb/jammy/debian/copyright b/automation/packaging/deb/jammy/debian/copyright
@@ -3,5 +3,5 @@ Upstream-Name: jans
 Source: https://jans.io
 
 Files:     *
-Copyright: 2023 The Janssen Project. support@jans.io
+Copyright: 2024 The Janssen Project. support@jans.io
 License:   Apache-2.0
diff --git a/demos/benchmarking/docker-jans-loadtesting-jmeter/scripts/tests/authorization_code_flow.jmx b/demos/benchmarking/docker-jans-loadtesting-jmeter/scripts/tests/authorization_code_flow.jmx
@@ -49,7 +49,7 @@
           </elementProp>
           <elementProp name="location_regexp" elementType="Argument">
             <stringProp name="Argument.name">location_regexp</stringProp>
-            <stringProp name="Argument.value">Location: https:\/\/FQDN_PART1\.FQDN_PART2\.FQDN_PART3(.*)</stringProp>
+            <stringProp name="Argument.value">location: https:\/\/FQDN_PART1\.FQDN_PART2\.FQDN_PART3(.*)</stringProp>
             <stringProp name="Argument.metadata">=</stringProp>
           </elementProp>
         </collectionProp>

diff --git a/demos/benchmarking/docker-jans-loadtesting-jmeter/scripts/tests/implicit_flow.jmx b/demos/benchmarking/docker-jans-loadtesting-jmeter/scripts/tests/implicit_flow.jmx
@@ -81,7 +81,7 @@
         <stringProp name="ThreadGroup.on_sample_error">continue</stringProp>
         <elementProp name="ThreadGroup.main_controller" elementType="LoopController" guiclass="LoopControlPanel" testclass="LoopController" testname="Loop Controller" enabled="true">
           <boolProp name="LoopController.continue_forever">false</boolProp>
-          <stringProp name="LoopController.loops">1</stringProp>
+          <stringProp name="LoopController.loops">-1</stringProp>
         </elementProp>
         <stringProp name="ThreadGroup.num_threads">THREAD_COUNT</stringProp>
         <stringProp name="ThreadGroup.ramp_time">10</stringProp>

diff --git a/...king/docker-jans-loadtesting-jmeter/scripts/tests/resource_owner_password_credentials.jmx b/...king/docker-jans-loadtesting-jmeter/scripts/tests/resource_owner_password_credentials.jmx
@@ -66,7 +66,7 @@
         <stringProp name="ThreadGroup.on_sample_error">continue</stringProp>
         <elementProp name="ThreadGroup.main_controller" elementType="LoopController" guiclass="LoopControlPanel" testclass="LoopController" testname="Loop Controller" enabled="true">
           <boolProp name="LoopController.continue_forever">false</boolProp>
-          <stringProp name="LoopController.loops">1</stringProp>
+          <stringProp name="LoopController.loops">-1</stringProp>
         </elementProp>
         <stringProp name="ThreadGroup.num_threads">THREAD_COUNT</stringProp>
         <stringProp name="ThreadGroup.ramp_time">10</stringProp>