Merge pull request #68 from dianagudu/ci/devel

Ci/devel
dianagudu · Feb 15, 2024 · 395c69a · 395c69a
2 parents ea74e0a + dfad167
commit 395c69a
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 21 deletions.
diff --git a/.gitlab-ci-scripts/set-prerelease-version.sh b/.gitlab-ci-scripts/set-prerelease-version.sh
@@ -29,9 +29,10 @@ done
 # Get master branch name:
 #   use origin if exists
 #   else use last found remote
+
 MASTER_BRANCH=""
 get_master_branch_of_mteam() {
-    git remote -vv | awk -F[\\t@:] '{ print $1 " " $3 }' | while read REMOTE HOST; do
+    git remote -vv | awk -F[\\t@:] '{ print $1 " " $3 }' | while read REMOTE HOST; do 
         # echo " $HOST -- $REMOTE"
         MASTER=$(git remote show "$REMOTE"  2>/dev/null \
             | sed -n '/HEAD branch/s/.*: //p')
@@ -50,7 +51,6 @@ get_master_branch_of_mteam() {
         }
     done
 }
-
 MASTER_BRANCH=$(get_master_branch_of_mteam)
 PREREL=$(git rev-list --count HEAD ^"$MASTER_BRANCH")
 

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
@@ -37,22 +37,14 @@ build-centos-7:
       # Force RPM's python-bytecompile script to use python3
       sed "s@^default_python@default_python=python3\n#default_python@" -i /usr/lib/rpm/brp-python-bytecompile
       echo "typing-extensions" >> requirements.txt
-    - make rpms
-
-build-ubuntu-bionic:
-  extends:
-    - .build-ubuntu-bionic
-  script:
-    - |
-      cat debian/rules \
-      | sed s/"dh_virtualenv --python python3"/"dh_virtualenv --python python3.8"/ \
-      > debian/new-rules
-      cat debian/new-rules > debian/rules
-      make debsource
-      dpkg-buildpackage -uc -us
+    - !reference [.rpm-build-script]
 
 ##########################################################################
 # Integration (These might to to a central job def)
-integration-tests:
+trigger-integration-tests:
+  variables:
+    TRIGGER_TOKEN: ${TRIGGER_TOKEN_OIDC_SSH_MOTLEY_CUE}
+    API_TOKEN: ${API_TOKEN_OIDC_SSH_MOTLEY_CUE}
+    # api token needs "read_api" privileges of developer
   extends:
     - .trigger-integration-tests-ssh-oidc
diff --git a/doc/source/configuration.rst b/doc/source/configuration.rst
@@ -34,7 +34,7 @@ The config files will be searched in several places. Once one is found no furthe
   - ``$HOME/.config/motley_cue/motley_cue.conf``
   - ``/etc/motley_cue/motley_cue.conf``
 
-- **feudal_adapter.conf** (according to the `feudalAdapter documentation <https://git.scc.kit.edu/feudal/feudalAdapterLdf/-/tree/master#config-file-search-path>`_)
+- **feudal_adapter.conf** (according to the `feudalAdapter documentation <https://codebase.helmholtz.cloud/m-team/feudal/feudalAdapterLdf/-/tree/master#config-file-search-path>`_)
 
   - path configured via the environment variable ``FEUDAL_ADAPTER_CONFIG``
   - ``./feudal_adapter.conf``
@@ -106,15 +106,15 @@ Furthermore, you can also configure an **audience** for the service in order to
 Account creation configuration
 -------------------------------
 
-This is handled by the feudal adapter in ``feudal_adapter.conf`` (see the `documentation <https://git.scc.kit.edu/feudal/feudalAdapterLdf>`_ for details).
+This is handled by the feudal adapter in ``feudal_adapter.conf`` (see the `documentation <https://codebase.helmholtz.cloud/m-team/feudal/feudalAdapterLdf>`_ for details).
 
 Pay close attention to the following configurations:
 
-- **backend**: how are the users managed locally (e.g. local UNIX accounts, `LDAP <https://git.scc.kit.edu/feudal/feudalAdapterLdf/-/blob/master/LDAP.md>`_, ...)
+- **backend**: how are the users managed locally (e.g. local UNIX accounts, `LDAP <https://codebase.helmholtz.cloud/m-team/feudal/feudalAdapterLdf/-/blob/master/LDAP.md>`_, ...)
 - **assurance**: specifying minimum acceptable assurance (according to the `REFEDS Assurance Framework <https://refeds.org/assurance>`_)
 - **username generator**: how local usernames are generated for users (e.g. trying to honour incoming ``preferred username`` from the OP, or using pooled accounts with a custom prefix)
 
-An `approval workflow <https://git.scc.kit.edu/feudal/feudalAdapterLdf/-/tree/master#approval-workflow>`_ is supported as well, where local admins can approve or reject account creation requests. The notification system supported so far is email.
+An `approval workflow <https://codebase.helmholtz.cloud/m-team/feudal/feudalAdapterLdf/-/tree/master#approval-workflow>`_ is supported as well, where local admins can approve or reject account creation requests. The notification system supported so far is email.
 
 .. _additional_configurations:
 

diff --git a/doc/source/usage.rst b/doc/source/usage.rst
@@ -85,4 +85,4 @@ Let's take as an example your federated identity at `EGI Check-inEGI AAI <https:
   }
   
 
-The following `document <https://git.scc.kit.edu/feudal/feudalAdapterLdf/-/blob/master/states.md>`_ gives a complete overview of the different states a local account can be in, as well as the actions that can be performed on a local account.
+The following `document <https://codebase.helmholtz.cloud/m-team/feudal/feudalAdapterLdf/-/blob/master/states.md>`_ gives a complete overview of the different states a local account can be in, as well as the actions that can be performed on a local account.
Original file line number	Diff line number	Diff line change
Expand Up		@@ -85,4 +85,4 @@ Let's take as an example your federated identity at `EGI Check-inEGI AAI <https:
		}


		The following `document <https://git.scc.kit.edu/feudal/feudalAdapterLdf/-/blob/master/states.md>`_ gives a complete overview of the different states a local account can be in, as well as the actions that can be performed on a local account.
		The following `document <https://codebase.helmholtz.cloud/m-team/feudal/feudalAdapterLdf/-/blob/master/states.md>`_ gives a complete overview of the different states a local account can be in, as well as the actions that can be performed on a local account.