Merge pull request openSUSE#1599 from dmach/gitea_api

Add 'gitea_api' module and 'git-obs' executable

Author: dmach

.github/workflows/tests.yaml

@@ -25,7 +25,7 @@ jobs:
         run: |
             sudo apt-get -y update
             sudo apt-get -y --no-install-recommends install git-lfs
-            sudo apt-get -y --no-install-recommends install diffstat diffutils git-core python3 python3-cryptography python3-pip python3-rpm python3-setuptools python3-urllib3
+            sudo apt-get -y --no-install-recommends install diffstat diffutils git-core python3 python3-cryptography python3-pip python3-rpm python3-ruamel.yaml python3-setuptools python3-urllib3
 
       - uses: actions/checkout@v3
 
@@ -85,23 +85,23 @@ jobs:
             zypper -n lr --details
             grep -qi tumbleweed /etc/os-release && zypper -n dist-upgrade || zypper -n patch || zypper -n patch
             zypper -n install git-lfs
-            zypper -n install diffstat diffutils git-core python3 python3-cryptography python3-pip python3-rpm python3-setuptools python3-urllib3
+            zypper -n install diffstat diffutils git-core python3 python3-cryptography python3-pip python3-rpm python3-ruamel.yaml python3-setuptools python3-urllib3
 
       - name: 'Install packages (Fedora/CentOS)'
         if: ${{ contains(matrix.container, '/fedora:') || contains(matrix.container, '/centos:') }}
         run: |
             dnf -y makecache
             dnf -y distro-sync
             dnf -y install git-lfs
-            dnf -y install diffstat diffutils git-core python3 python3-cryptography python3-pip python3-rpm python3-setuptools python3-urllib3
+            dnf -y install diffstat diffutils git-core python3 python3-cryptography python3-pip python3-rpm python3-ruamel-yaml python3-setuptools python3-urllib3
 
       - name: 'Install packages (Debian/Ubuntu)'
         if: ${{ contains(matrix.container, '/debian:') || contains(matrix.container, '/ubuntu:') }}
         run: |
             apt-get -y update
             apt-get -y upgrade
             apt-get -y --no-install-recommends install git-lfs
-            apt-get -y --no-install-recommends install diffstat diffutils git-core python3 python3-cryptography python3-pip python3-rpm python3-setuptools python3-urllib3
+            apt-get -y --no-install-recommends install diffstat diffutils git-core python3 python3-cryptography python3-pip python3-rpm python3-ruamel.yaml python3-setuptools python3-urllib3
 
       - uses: actions/checkout@v3
 
@@ -131,7 +131,7 @@ jobs:
         run: |
             sudo sh -c '. /etc/os-release; echo "deb [trusted=yes] http://download.opensuse.org/repositories/openSUSE:Tools/xUbuntu_${VERSION_ID} ./" > /etc/apt/sources.list.d/openSUSE-Tools.list'
             sudo apt-get -y update
-            sudo apt-get -y --no-install-recommends install python3-behave diffstat diffutils python3 python3-cryptography python3-pip python3-rpm python3-setuptools python3-urllib3 obs-build obs-service-set-version
+            sudo apt-get -y --no-install-recommends install python3-behave diffstat diffutils python3 python3-cryptography python3-pip python3-rpm python3-ruamel.yaml python3-setuptools python3-urllib3 obs-build obs-service-set-version
 
       - name: "Checkout sources"
         uses: actions/checkout@v3
@@ -143,4 +143,4 @@ jobs:
       - name: "Run tests"
         run: |
           cd behave
-          behave -Dosc=../osc-wrapper.py -Dmax_podman_containers=2
+          behave -Dosc=../osc-wrapper.py -Dpodman_max_containers=2

behave/Containerfile

@@ -1,13 +1,18 @@
-FROM opensuse/leap:15.5
+FROM opensuse/leap:15.6
+
+RUN zypper -n modifyrepo --disable repo-openh264 || : \
+    && zypper ar --repo http://download.opensuse.org/repositories/OBS:/Server:/Unstable/15.6/OBS:Server:Unstable.repo \
+    && zypper ar --repo http://download.opensuse.org/repositories/devel:/tools:/scm/15.6/devel:tools:scm.repo \
+    && zypper -n --gpg-auto-import-keys refresh
 
-RUN zypper ar --repo http://download.opensuse.org/repositories/OBS:/Server:/Unstable/15.5/OBS:Server:Unstable.repo
-RUN zypper -n --gpg-auto-import-keys refresh
 RUN zypper -n install \
     bash \
     bash-completion \
     git \
+    gitea \
     less \
     obs-api \
+    obs-gitea-bridge \
     obs-server \
     obs-signd \
     obs-worker \
@@ -16,17 +21,21 @@ RUN zypper -n install \
     openssl \
     perl-XML-SAX \
     rpm-build \
+    sqlite3 \
     systemd \
     vim \
     && rm -rf /var/cache/zypp/*
 
-# increase the number if we need to run the following setup steps again (for debugging purposes)
-ENV BUILD_NUMBER 1
+COPY container-files/ /
 
-RUN /bin/bash /opt/obs/container-setup.sh
-COPY container-oscrc /root/.config/osc/oscrc
-RUN /bin/bash /opt/obs/container-setup-initial-data.sh
-RUN /bin/bash /opt/obs/container-setup-prebuilt-rpms.sh
+RUN /bin/bash /opt/setup/setup.sh \
+    && /bin/bash /opt/setup/initial-data.sh \
+    && /bin/bash /opt/setup/prebuilt-rpms.sh \
+    && /bin/bash /opt/setup/gitea.sh \
+    && rm -rf /var/log/apache2/* \
+    && rm -rf /srv/obs/log/* \
+    && rm -rf /srv/obs/service/log/* \
+    && rm -rf /srv/www/obs/api/log/*
 
-# /sbin/init doesn't exist on Leap 15.5
+# /sbin/init doesn't exist on Leap 15.6
 ENTRYPOINT ["/usr/lib/systemd/systemd"]

behave/README.md

@@ -18,7 +18,7 @@ Build a container with OBS
 $ cd behave
 
 # optional: refresh the base image
-$ podman pull opensuse/leap:15.5
+$ podman pull opensuse/leap:15.6
 
 # build the container image
 $ ./container-build.sh [--no-cache]
@@ -36,7 +36,11 @@ Use the container
 ```
 $ cd behave
 
-# run 'obs-server' container on port 1443
+# run 'obs-server' container on ports:
+#     1443 - api+web, https
+#     1082 - repos, http
+#     3000 - gitea, http
+#     3022 - gitea, ssh
 # running this command again replaces the current container with a fresh one
 $ ./container-run.sh
 

behave/container-build.sh

@@ -4,7 +4,6 @@ TOPDIR=$(dirname $(readlink -f $0))
 
 podman build "$@" \
     --tag obs-server \
-    --volume="$TOPDIR":/opt/obs \
     $TOPDIR \
     2>&1 | tee container-build.log
 

behave/container-files/etc/gitea/conf/app.ini

@@ -0,0 +1,36 @@
+WORK_PATH = /var/lib/gitea
+
+[server]
+CERT_FILE = /etc/gitea/https/cert.pem
+KEY_FILE = /etc/gitea/https/key.pem
+STATIC_ROOT_PATH = /usr/share/gitea
+APP_DATA_PATH = /var/lib/gitea/data
+PPROF_DATA_PATH = /var/lib/gitea/data/tmp/pprof
+PROTOCOL = http
+HTTP_PORT = 3000
+DISABLE_SSH = false
+START_SSH_SERVER = true
+SSH_PORT = 3022
+LFS_START_SERVER = true
+
+[lfs]
+PATH = /var/lib/gitea/data/lfs
+
+[database]
+DB_TYPE = sqlite3
+PATH = /var/lib/gitea/data/gitea.db
+
+[security]
+INSTALL_LOCK = true
+
+[oauth2]
+ENABLED = false
+
+[log]
+ROOT_PATH = /var/log/gitea
+MODE = console, file
+; Either "Trace", "Debug", "Info", "Warn", "Error" or "None", default is "Info"
+LEVEL = Debug
+
+[service]
+ENABLE_BASIC_AUTHENTICATION = true

behave/container-files/etc/systemd/system/gitea-configure-from-env.service

@@ -0,0 +1,13 @@
+[Unit]
+Description=Configure /etc/gitea/conf/app.ini from environmental variables
+
+[Service]
+Type=oneshot
+User=root
+Group=root
+PassEnvironment=GITEA_SERVER_HTTP_PORT
+PassEnvironment=GITEA_SERVER_SSH_PORT
+ExecStart=bash -c /usr/bin/gitea-configure-from-env
+
+[Install]
+RequiredBy=gitea.service

behave/container-files/etc/systemd/system/gitea-fix-var-lib-gitea-data.service

@@ -0,0 +1,11 @@
+[Unit]
+Description=Fix /var/lib/gitea/data by copying it back and forth to the same overlayfs layer
+
+[Service]
+Type=oneshot
+User=gitea
+Group=gitea
+ExecStart=/bin/bash -c 'mv /var/lib/gitea/data /var/lib/gitea/data.backup && mkdir -p /var/lib/gitea/data && cp -a /var/lib/gitea/data.backup/* /var/lib/gitea/data/'
+
+[Install]
+RequiredBy=gitea.service

behave/container-files/etc/systemd/system/obs-configure-from-env.service

@@ -0,0 +1,12 @@
+[Unit]
+Description=Configure OBS from environmental variables
+
+[Service]
+Type=oneshot
+User=root
+Group=root
+PassEnvironment=OBS_PROXY_AUTH
+ExecStart=bash -c /usr/bin/obs-configure-from-env
+
+[Install]
+RequiredBy=apache2.service