Skip to content

Commit

Permalink
tests: update for kojihub Git location
Browse files Browse the repository at this point in the history
Koji upstream commit 5c3edc2ac8fec25070e1ec43e75de2d80bade75a moved the
hub files to a new location in the tree. Update the test code to the new
locations.
  • Loading branch information
ktdreyer committed Jan 6, 2023
1 parent 196468b commit 66a68ed
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 6 deletions.
4 changes: 2 additions & 2 deletions tests/integration/apache.conf
Original file line number Diff line number Diff line change
Expand Up @@ -13,15 +13,15 @@ WSGIPythonPath %BUILD_DIR%/koji
SSLCertificateKeyFile /etc/ssl/private/localhost.key
SSLCACertificateFile /etc/ssl/certs/koji-ca.crt

SetEnv koji.hub.ConfigFile %BUILD_DIR%/koji/hub/hub.conf
SetEnv koji.hub.ConfigFile %BUILD_DIR%/koji/kojihub/app/hub.conf

<Directory "%BUILD_DIR%/">
Options FollowSymLinks MultiViews ExecCGI
AllowOverride All
Require all granted
</Directory>

Include %BUILD_DIR%/koji/hub/httpd.conf
Include %BUILD_DIR%/koji/kojihub/app/httpd.conf

# GitHub Actions has Ubuntu Focal, and the default out-of-the-box settings
# for the Focal apache package do not work with Focal's requests v2.22.0.
Expand Down
8 changes: 4 additions & 4 deletions tests/integration/setup.sh
Original file line number Diff line number Diff line change
Expand Up @@ -62,11 +62,11 @@ sudo cp -f tests/integration/apache.conf /etc/apache2/sites-available/000-defaul
sudo sed -e "s?%BUILD_DIR%?$(pwd)?g" --in-place /etc/apache2/sites-available/000-default.conf

# configuration to use our local kojihub Git clone
sed -i -e "s,/usr/share/koji-hub,$(pwd)/koji/hub,g" koji/hub/httpd.conf
sed -i -e "s,/usr/share/koji-hub,$(pwd)/koji/kojihub/app,g" koji/kojihub/app/httpd.conf

sed -i -e "s,#DBHost = .*,DBHost = 127.0.0.1," koji/hub/hub.conf
sed -i -e "s,#DBPass = .*,DBPass = koji," koji/hub/hub.conf
sed -i -e "s,KojiDir = koji,KojiDir = $HOME/mnt/koji," koji/hub/hub.conf
sed -i -e "s,#DBHost = .*,DBHost = 127.0.0.1," koji/kojihub/app/hub.conf
sed -i -e "s,#DBPass = .*,DBPass = koji," koji/kojihub/app/hub.conf
sed -i -e "s,KojiDir = koji,KojiDir = $HOME/mnt/koji," koji/kojihub/app/hub.conf

mkdir -p $HOME/mnt/koji

Expand Down

0 comments on commit 66a68ed

Please sign in to comment.