diff --git a/behave/Containerfile b/behave/Containerfile index a8152c43..48ea0912 100644 --- a/behave/Containerfile +++ b/behave/Containerfile @@ -20,13 +20,15 @@ RUN zypper -n install \ 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 -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 \ + && 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 ENTRYPOINT ["/usr/lib/systemd/systemd"] diff --git a/behave/container-build.sh b/behave/container-build.sh index 620732dc..542329eb 100755 --- a/behave/container-build.sh +++ b/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 diff --git a/behave/container-setup-common.sh b/behave/container-files/opt/setup/common.sh similarity index 100% rename from behave/container-setup-common.sh rename to behave/container-files/opt/setup/common.sh diff --git a/behave/container-files/opt/setup/fixtures/pac/multibuild-pkg-1._multibuild b/behave/container-files/opt/setup/fixtures/pac/multibuild-pkg-1._multibuild new file mode 100644 index 00000000..4ad5ea04 --- /dev/null +++ b/behave/container-files/opt/setup/fixtures/pac/multibuild-pkg-1._multibuild @@ -0,0 +1,4 @@ + + flavor1 + flavor2 + diff --git a/behave/container-files/opt/setup/fixtures/pac/multibuild-pkg-1.changes b/behave/container-files/opt/setup/fixtures/pac/multibuild-pkg-1.changes new file mode 100644 index 00000000..6bc25114 --- /dev/null +++ b/behave/container-files/opt/setup/fixtures/pac/multibuild-pkg-1.changes @@ -0,0 +1,4 @@ +------------------------------------------------------------------- +Tue Feb 1 11:22:33 UTC 2022 - Geeko Packager + +- Release upstream version 1 diff --git a/behave/container-files/opt/setup/fixtures/pac/multibuild-pkg-1.spec b/behave/container-files/opt/setup/fixtures/pac/multibuild-pkg-1.spec new file mode 100644 index 00000000..6238316c --- /dev/null +++ b/behave/container-files/opt/setup/fixtures/pac/multibuild-pkg-1.spec @@ -0,0 +1,100 @@ +%if %undefined flavor +%define flavor @BUILD_FLAVOR@%{nil} +%endif + +# create own debug packages, because the auto-generated would get removed due to being empty +%undefine _debuginfo_subpackages + + +Name: multibuild-pkg +Version: 1 +Release: 1 +License: GPL-2.0 +Summary: Test package +URL: https://example.com/test-package/ + + +%description +desc + + +%prep + + +%build + + +%install + + + + +# no flavor +%if "%{flavor}" == "%{nil}" +%files + + +%package debuginfo +Summary: Test debuginfo package + +%description debuginfo +desc + +%files debuginfo +%ghost /usr/lib/debug/multibuild-pkg.debug + + +%package debugsource +Summary: Test debugsource package + +%description debugsource +desc + +%files debugsource +%ghost %{_prefix}/src/debug/%{name}-%{version}-%{release}.%{arch}/main.c +%endif + + +# flavor1 +%if "%{flavor}" == "flavor1" +%package -n %{name}-%{flavor} +Summary: Multibuild test package, flavor1 + +%description -n %{name}-%{flavor} +desc + +%files -n %{name}-%{flavor} + +%package -n %{name}-%{flavor}-debuginfo +Summary: Test debuginfo package + +%description -n %{name}-%{flavor}-debuginfo +desc + +%files -n %{name}-%{flavor}-debuginfo +%ghost %{_prefix}/lib/debug/multibuild-pkg.debug +%endif + + +# flavor2 +%if "%{flavor}" == "flavor2" +%package -n %{name}-%{flavor} +Summary: Multibuild test package, flavor2 + +%description -n %{name}-%{flavor} +desc + +%files -n %{name}-%{flavor} + +%package -n %{name}-%{flavor}-debuginfo +Summary: Test debuginfo package + +%description -n %{name}-%{flavor}-debuginfo +desc + +%files -n %{name}-%{flavor}-debuginfo +%ghost %{_prefix}/lib/debug/multibuild-pkg.debug +%endif + + +%changelog diff --git a/behave/container-files/opt/setup/fixtures/pac/test-pkgA-1.changes b/behave/container-files/opt/setup/fixtures/pac/test-pkgA-1.changes new file mode 100644 index 00000000..0abbd70a --- /dev/null +++ b/behave/container-files/opt/setup/fixtures/pac/test-pkgA-1.changes @@ -0,0 +1,4 @@ +------------------------------------------------------------------- +Mon Jan 3 11:22:33 UTC 2022 - Geeko Packager + +- Release upstream version 1 diff --git a/behave/container-files/opt/setup/fixtures/pac/test-pkgA-1.spec b/behave/container-files/opt/setup/fixtures/pac/test-pkgA-1.spec new file mode 100644 index 00000000..8dbaa59e --- /dev/null +++ b/behave/container-files/opt/setup/fixtures/pac/test-pkgA-1.spec @@ -0,0 +1,25 @@ +Name: test-pkgA +Version: 1 +Release: 1 +License: GPL-2.0 +Summary: Test package +URL: https://example.com/test-package/ + + +BuildArch: noarch + + +%description +desc + + +%prep + + +%install + + +%files + + +%changelog diff --git a/behave/container-files/opt/setup/fixtures/pac/test-pkgA-2.changes b/behave/container-files/opt/setup/fixtures/pac/test-pkgA-2.changes new file mode 100644 index 00000000..c950d335 --- /dev/null +++ b/behave/container-files/opt/setup/fixtures/pac/test-pkgA-2.changes @@ -0,0 +1,4 @@ +------------------------------------------------------------------- +Tue Jan 4 11:22:33 UTC 2022 - Geeko Packager + +- Release upstream version 2 diff --git a/behave/container-files/opt/setup/fixtures/pac/test-pkgA-2.spec b/behave/container-files/opt/setup/fixtures/pac/test-pkgA-2.spec new file mode 100644 index 00000000..7f033a2e --- /dev/null +++ b/behave/container-files/opt/setup/fixtures/pac/test-pkgA-2.spec @@ -0,0 +1,25 @@ +Name: test-pkgA +Version: 2 +Release: 1 +License: GPL-2.0 +Summary: Test package +URL: https://example.com/test-package/ + + +BuildArch: noarch + + +%description +desc + + +%prep + + +%install + + +%files + + +%changelog diff --git a/behave/container-files/opt/setup/fixtures/pac/test-pkgA-3.changes b/behave/container-files/opt/setup/fixtures/pac/test-pkgA-3.changes new file mode 100644 index 00000000..2a85a6b1 --- /dev/null +++ b/behave/container-files/opt/setup/fixtures/pac/test-pkgA-3.changes @@ -0,0 +1,4 @@ +------------------------------------------------------------------- +Wed Jan 5 11:22:33 UTC 2022 - Geeko Packager + +- Release upstream version 3 diff --git a/behave/container-files/opt/setup/fixtures/pac/test-pkgA-3.spec b/behave/container-files/opt/setup/fixtures/pac/test-pkgA-3.spec new file mode 100644 index 00000000..0fc6a5cb --- /dev/null +++ b/behave/container-files/opt/setup/fixtures/pac/test-pkgA-3.spec @@ -0,0 +1,25 @@ +Name: test-pkgA +Version: 3 +Release: 1 +License: GPL-2.0 +Summary: Test package +URL: https://example.com/test-package/ + + +BuildArch: noarch + + +%description +desc + + +%prep + + +%install + + +%files + + +%changelog diff --git a/behave/container-files/opt/setup/fixtures/pac/test-pkgB-1.changes b/behave/container-files/opt/setup/fixtures/pac/test-pkgB-1.changes new file mode 100644 index 00000000..6bc25114 --- /dev/null +++ b/behave/container-files/opt/setup/fixtures/pac/test-pkgB-1.changes @@ -0,0 +1,4 @@ +------------------------------------------------------------------- +Tue Feb 1 11:22:33 UTC 2022 - Geeko Packager + +- Release upstream version 1 diff --git a/behave/container-files/opt/setup/fixtures/pac/test-pkgB-1.spec b/behave/container-files/opt/setup/fixtures/pac/test-pkgB-1.spec new file mode 100644 index 00000000..267a490d --- /dev/null +++ b/behave/container-files/opt/setup/fixtures/pac/test-pkgB-1.spec @@ -0,0 +1,25 @@ +Name: test-pkgB +Version: 1 +Release: 1 +License: GPL-2.0 +Summary: Test package +URL: https://example.com/test-package/ + + +BuildArch: noarch + + +%description +desc + + +%prep + + +%install + + +%files + + +%changelog diff --git a/behave/container-files/opt/setup/fixtures/pac/test-pkgB-2.changes b/behave/container-files/opt/setup/fixtures/pac/test-pkgB-2.changes new file mode 100644 index 00000000..10139abc --- /dev/null +++ b/behave/container-files/opt/setup/fixtures/pac/test-pkgB-2.changes @@ -0,0 +1,4 @@ +------------------------------------------------------------------- +Wed Feb 2 11:22:33 UTC 2022 - Geeko Packager + +- Release upstream version 2 diff --git a/behave/container-files/opt/setup/fixtures/pac/test-pkgB-2.spec b/behave/container-files/opt/setup/fixtures/pac/test-pkgB-2.spec new file mode 100644 index 00000000..f86ba973 --- /dev/null +++ b/behave/container-files/opt/setup/fixtures/pac/test-pkgB-2.spec @@ -0,0 +1,25 @@ +Name: test-pkgB +Version: 2 +Release: 1 +License: GPL-2.0 +Summary: Test package +URL: https://example.com/test-package/ + + +BuildArch: noarch + + +%description +desc + + +%prep + + +%install + + +%files + + +%changelog diff --git a/behave/fixtures/prj/home_Admin.xml b/behave/container-files/opt/setup/fixtures/prj/home_Admin.xml similarity index 100% rename from behave/fixtures/prj/home_Admin.xml rename to behave/container-files/opt/setup/fixtures/prj/home_Admin.xml diff --git a/behave/fixtures/prj/openSUSE.org.xml b/behave/container-files/opt/setup/fixtures/prj/openSUSE.org.xml similarity index 100% rename from behave/fixtures/prj/openSUSE.org.xml rename to behave/container-files/opt/setup/fixtures/prj/openSUSE.org.xml diff --git a/behave/fixtures/prj/test_devel.xml b/behave/container-files/opt/setup/fixtures/prj/test_devel.xml similarity index 100% rename from behave/fixtures/prj/test_devel.xml rename to behave/container-files/opt/setup/fixtures/prj/test_devel.xml diff --git a/behave/fixtures/prj/test_factory.xml b/behave/container-files/opt/setup/fixtures/prj/test_factory.xml similarity index 100% rename from behave/fixtures/prj/test_factory.xml rename to behave/container-files/opt/setup/fixtures/prj/test_factory.xml diff --git a/behave/fixtures/prj/test_factory_update.xml b/behave/container-files/opt/setup/fixtures/prj/test_factory_update.xml similarity index 100% rename from behave/fixtures/prj/test_factory_update.xml rename to behave/container-files/opt/setup/fixtures/prj/test_factory_update.xml diff --git a/behave/fixtures/prj/test_leap_15.6.xml b/behave/container-files/opt/setup/fixtures/prj/test_leap_15.6.xml similarity index 100% rename from behave/fixtures/prj/test_leap_15.6.xml rename to behave/container-files/opt/setup/fixtures/prj/test_leap_15.6.xml diff --git a/behave/fixtures/prj/test_leap_15.6_update.xml b/behave/container-files/opt/setup/fixtures/prj/test_leap_15.6_update.xml similarity index 100% rename from behave/fixtures/prj/test_leap_15.6_update.xml rename to behave/container-files/opt/setup/fixtures/prj/test_leap_15.6_update.xml diff --git a/behave/fixtures/prj/test_release.xml b/behave/container-files/opt/setup/fixtures/prj/test_release.xml similarity index 100% rename from behave/fixtures/prj/test_release.xml rename to behave/container-files/opt/setup/fixtures/prj/test_release.xml diff --git a/behave/container-setup-initial-data.sh b/behave/container-files/opt/setup/initial-data.sh similarity index 98% rename from behave/container-setup-initial-data.sh rename to behave/container-files/opt/setup/initial-data.sh index 2058bb3b..df6c0292 100644 --- a/behave/container-setup-initial-data.sh +++ b/behave/container-files/opt/setup/initial-data.sh @@ -3,7 +3,7 @@ set -e TOPDIR=$(dirname $(readlink -f "$0")) -source "$TOPDIR/container-setup-common.sh" +source "$TOPDIR/common.sh" start_mysql diff --git a/behave/container-setup-prebuilt-rpms.sh b/behave/container-files/opt/setup/prebuilt-rpms.sh similarity index 98% rename from behave/container-setup-prebuilt-rpms.sh rename to behave/container-files/opt/setup/prebuilt-rpms.sh index a7b74344..ee729c68 100644 --- a/behave/container-setup-prebuilt-rpms.sh +++ b/behave/container-files/opt/setup/prebuilt-rpms.sh @@ -3,7 +3,7 @@ set -e TOPDIR=$(dirname $(readlink -f "$0")) -source "$TOPDIR/container-setup-common.sh" +source "$TOPDIR/common.sh" start_obs_srcserver diff --git a/behave/container-setup.sh b/behave/container-files/opt/setup/setup.sh similarity index 94% rename from behave/container-setup.sh rename to behave/container-files/opt/setup/setup.sh index 2e5fe92b..51d8d5ee 100644 --- a/behave/container-setup.sh +++ b/behave/container-files/opt/setup/setup.sh @@ -3,7 +3,7 @@ set -e TOPDIR=$(dirname $(readlink -f "$0")) -source "$TOPDIR/container-setup-common.sh" +source "$TOPDIR/common.sh" # tweak configuration @@ -103,7 +103,9 @@ RAILS_ENV=production SAFETY_ASSURED=1 bin/rails db:setup writeconfiguration # update configuration and write it to disk +echo "update configurations set admin_email='admin@example.com';" | su -s /bin/sh - mysql -c "mysql api_production" echo "update configurations set download_url='http://localhost:1082';" | su -s /bin/sh - mysql -c "mysql api_production" +echo "update configurations set obs_url='https://localhost:1443';" | su -s /bin/sh - mysql -c "mysql api_production" cd /srv/www/obs/api; RAILS_ENV=production SAFETY_ASSURED=1 bin/rails writeconfiguration diff --git a/behave/container-run.sh b/behave/container-run.sh index e976cfe7..05b2d9e5 100755 --- a/behave/container-run.sh +++ b/behave/container-run.sh @@ -10,7 +10,7 @@ podman run \ --detach \ --interactive \ --tty \ - --volume="$TOPDIR":/opt/obs \ + --volume="$TOPDIR":/opt/workdir \ --cap-add SYS_PTRACE \ -p 1443:443 \ -p 1082:82 \ diff --git a/behave/fixtures/pac/multibuild-pkg-1._multibuild b/behave/fixtures/pac/multibuild-pkg-1._multibuild deleted file mode 100644 index 4ad5ea04..00000000 --- a/behave/fixtures/pac/multibuild-pkg-1._multibuild +++ /dev/null @@ -1,4 +0,0 @@ - - flavor1 - flavor2 - diff --git a/behave/fixtures/pac/multibuild-pkg-1._multibuild b/behave/fixtures/pac/multibuild-pkg-1._multibuild new file mode 120000 index 00000000..dbc1b706 --- /dev/null +++ b/behave/fixtures/pac/multibuild-pkg-1._multibuild @@ -0,0 +1 @@ +../../container-files/opt/setup/fixtures/pac/multibuild-pkg-1._multibuild \ No newline at end of file diff --git a/behave/fixtures/pac/multibuild-pkg-1.changes b/behave/fixtures/pac/multibuild-pkg-1.changes deleted file mode 100644 index 6bc25114..00000000 --- a/behave/fixtures/pac/multibuild-pkg-1.changes +++ /dev/null @@ -1,4 +0,0 @@ -------------------------------------------------------------------- -Tue Feb 1 11:22:33 UTC 2022 - Geeko Packager - -- Release upstream version 1 diff --git a/behave/fixtures/pac/multibuild-pkg-1.changes b/behave/fixtures/pac/multibuild-pkg-1.changes new file mode 120000 index 00000000..7021ef86 --- /dev/null +++ b/behave/fixtures/pac/multibuild-pkg-1.changes @@ -0,0 +1 @@ +../../container-files/opt/setup/fixtures/pac/multibuild-pkg-1.changes \ No newline at end of file diff --git a/behave/fixtures/pac/multibuild-pkg-1.spec b/behave/fixtures/pac/multibuild-pkg-1.spec deleted file mode 100644 index 6238316c..00000000 --- a/behave/fixtures/pac/multibuild-pkg-1.spec +++ /dev/null @@ -1,100 +0,0 @@ -%if %undefined flavor -%define flavor @BUILD_FLAVOR@%{nil} -%endif - -# create own debug packages, because the auto-generated would get removed due to being empty -%undefine _debuginfo_subpackages - - -Name: multibuild-pkg -Version: 1 -Release: 1 -License: GPL-2.0 -Summary: Test package -URL: https://example.com/test-package/ - - -%description -desc - - -%prep - - -%build - - -%install - - - - -# no flavor -%if "%{flavor}" == "%{nil}" -%files - - -%package debuginfo -Summary: Test debuginfo package - -%description debuginfo -desc - -%files debuginfo -%ghost /usr/lib/debug/multibuild-pkg.debug - - -%package debugsource -Summary: Test debugsource package - -%description debugsource -desc - -%files debugsource -%ghost %{_prefix}/src/debug/%{name}-%{version}-%{release}.%{arch}/main.c -%endif - - -# flavor1 -%if "%{flavor}" == "flavor1" -%package -n %{name}-%{flavor} -Summary: Multibuild test package, flavor1 - -%description -n %{name}-%{flavor} -desc - -%files -n %{name}-%{flavor} - -%package -n %{name}-%{flavor}-debuginfo -Summary: Test debuginfo package - -%description -n %{name}-%{flavor}-debuginfo -desc - -%files -n %{name}-%{flavor}-debuginfo -%ghost %{_prefix}/lib/debug/multibuild-pkg.debug -%endif - - -# flavor2 -%if "%{flavor}" == "flavor2" -%package -n %{name}-%{flavor} -Summary: Multibuild test package, flavor2 - -%description -n %{name}-%{flavor} -desc - -%files -n %{name}-%{flavor} - -%package -n %{name}-%{flavor}-debuginfo -Summary: Test debuginfo package - -%description -n %{name}-%{flavor}-debuginfo -desc - -%files -n %{name}-%{flavor}-debuginfo -%ghost %{_prefix}/lib/debug/multibuild-pkg.debug -%endif - - -%changelog diff --git a/behave/fixtures/pac/multibuild-pkg-1.spec b/behave/fixtures/pac/multibuild-pkg-1.spec new file mode 120000 index 00000000..e28c19bd --- /dev/null +++ b/behave/fixtures/pac/multibuild-pkg-1.spec @@ -0,0 +1 @@ +../../container-files/opt/setup/fixtures/pac/multibuild-pkg-1.spec \ No newline at end of file diff --git a/behave/fixtures/pac/test-pkgA-1.changes b/behave/fixtures/pac/test-pkgA-1.changes deleted file mode 100644 index 0abbd70a..00000000 --- a/behave/fixtures/pac/test-pkgA-1.changes +++ /dev/null @@ -1,4 +0,0 @@ -------------------------------------------------------------------- -Mon Jan 3 11:22:33 UTC 2022 - Geeko Packager - -- Release upstream version 1 diff --git a/behave/fixtures/pac/test-pkgA-1.changes b/behave/fixtures/pac/test-pkgA-1.changes new file mode 120000 index 00000000..ee5b8c2c --- /dev/null +++ b/behave/fixtures/pac/test-pkgA-1.changes @@ -0,0 +1 @@ +../../container-files/opt/setup/fixtures/pac/test-pkgA-1.changes \ No newline at end of file diff --git a/behave/fixtures/pac/test-pkgA-1.spec b/behave/fixtures/pac/test-pkgA-1.spec deleted file mode 100644 index 8dbaa59e..00000000 --- a/behave/fixtures/pac/test-pkgA-1.spec +++ /dev/null @@ -1,25 +0,0 @@ -Name: test-pkgA -Version: 1 -Release: 1 -License: GPL-2.0 -Summary: Test package -URL: https://example.com/test-package/ - - -BuildArch: noarch - - -%description -desc - - -%prep - - -%install - - -%files - - -%changelog diff --git a/behave/fixtures/pac/test-pkgA-1.spec b/behave/fixtures/pac/test-pkgA-1.spec new file mode 120000 index 00000000..31332c8e --- /dev/null +++ b/behave/fixtures/pac/test-pkgA-1.spec @@ -0,0 +1 @@ +../../container-files/opt/setup/fixtures/pac/test-pkgA-1.spec \ No newline at end of file diff --git a/behave/fixtures/pac/test-pkgA-2.changes b/behave/fixtures/pac/test-pkgA-2.changes deleted file mode 100644 index c950d335..00000000 --- a/behave/fixtures/pac/test-pkgA-2.changes +++ /dev/null @@ -1,4 +0,0 @@ -------------------------------------------------------------------- -Tue Jan 4 11:22:33 UTC 2022 - Geeko Packager - -- Release upstream version 2 diff --git a/behave/fixtures/pac/test-pkgA-2.changes b/behave/fixtures/pac/test-pkgA-2.changes new file mode 120000 index 00000000..41a0128e --- /dev/null +++ b/behave/fixtures/pac/test-pkgA-2.changes @@ -0,0 +1 @@ +../../container-files/opt/setup/fixtures/pac/test-pkgA-2.changes \ No newline at end of file diff --git a/behave/fixtures/pac/test-pkgA-2.spec b/behave/fixtures/pac/test-pkgA-2.spec deleted file mode 100644 index 7f033a2e..00000000 --- a/behave/fixtures/pac/test-pkgA-2.spec +++ /dev/null @@ -1,25 +0,0 @@ -Name: test-pkgA -Version: 2 -Release: 1 -License: GPL-2.0 -Summary: Test package -URL: https://example.com/test-package/ - - -BuildArch: noarch - - -%description -desc - - -%prep - - -%install - - -%files - - -%changelog diff --git a/behave/fixtures/pac/test-pkgA-2.spec b/behave/fixtures/pac/test-pkgA-2.spec new file mode 120000 index 00000000..2a9d8e9b --- /dev/null +++ b/behave/fixtures/pac/test-pkgA-2.spec @@ -0,0 +1 @@ +../../container-files/opt/setup/fixtures/pac/test-pkgA-2.spec \ No newline at end of file diff --git a/behave/fixtures/pac/test-pkgA-3.changes b/behave/fixtures/pac/test-pkgA-3.changes deleted file mode 100644 index 2a85a6b1..00000000 --- a/behave/fixtures/pac/test-pkgA-3.changes +++ /dev/null @@ -1,4 +0,0 @@ -------------------------------------------------------------------- -Wed Jan 5 11:22:33 UTC 2022 - Geeko Packager - -- Release upstream version 3 diff --git a/behave/fixtures/pac/test-pkgA-3.changes b/behave/fixtures/pac/test-pkgA-3.changes new file mode 120000 index 00000000..22eaf2c4 --- /dev/null +++ b/behave/fixtures/pac/test-pkgA-3.changes @@ -0,0 +1 @@ +../../container-files/opt/setup/fixtures/pac/test-pkgA-3.changes \ No newline at end of file diff --git a/behave/fixtures/pac/test-pkgA-3.spec b/behave/fixtures/pac/test-pkgA-3.spec deleted file mode 100644 index 0fc6a5cb..00000000 --- a/behave/fixtures/pac/test-pkgA-3.spec +++ /dev/null @@ -1,25 +0,0 @@ -Name: test-pkgA -Version: 3 -Release: 1 -License: GPL-2.0 -Summary: Test package -URL: https://example.com/test-package/ - - -BuildArch: noarch - - -%description -desc - - -%prep - - -%install - - -%files - - -%changelog diff --git a/behave/fixtures/pac/test-pkgA-3.spec b/behave/fixtures/pac/test-pkgA-3.spec new file mode 120000 index 00000000..40f71faf --- /dev/null +++ b/behave/fixtures/pac/test-pkgA-3.spec @@ -0,0 +1 @@ +../../container-files/opt/setup/fixtures/pac/test-pkgA-3.spec \ No newline at end of file diff --git a/behave/fixtures/pac/test-pkgB-1.changes b/behave/fixtures/pac/test-pkgB-1.changes deleted file mode 100644 index 6bc25114..00000000 --- a/behave/fixtures/pac/test-pkgB-1.changes +++ /dev/null @@ -1,4 +0,0 @@ -------------------------------------------------------------------- -Tue Feb 1 11:22:33 UTC 2022 - Geeko Packager - -- Release upstream version 1 diff --git a/behave/fixtures/pac/test-pkgB-1.changes b/behave/fixtures/pac/test-pkgB-1.changes new file mode 120000 index 00000000..232bdf42 --- /dev/null +++ b/behave/fixtures/pac/test-pkgB-1.changes @@ -0,0 +1 @@ +../../container-files/opt/setup/fixtures/pac/test-pkgB-1.changes \ No newline at end of file diff --git a/behave/fixtures/pac/test-pkgB-1.spec b/behave/fixtures/pac/test-pkgB-1.spec deleted file mode 100644 index 267a490d..00000000 --- a/behave/fixtures/pac/test-pkgB-1.spec +++ /dev/null @@ -1,25 +0,0 @@ -Name: test-pkgB -Version: 1 -Release: 1 -License: GPL-2.0 -Summary: Test package -URL: https://example.com/test-package/ - - -BuildArch: noarch - - -%description -desc - - -%prep - - -%install - - -%files - - -%changelog diff --git a/behave/fixtures/pac/test-pkgB-1.spec b/behave/fixtures/pac/test-pkgB-1.spec new file mode 120000 index 00000000..b22ad3d7 --- /dev/null +++ b/behave/fixtures/pac/test-pkgB-1.spec @@ -0,0 +1 @@ +../../container-files/opt/setup/fixtures/pac/test-pkgB-1.spec \ No newline at end of file diff --git a/behave/fixtures/pac/test-pkgB-2.changes b/behave/fixtures/pac/test-pkgB-2.changes deleted file mode 100644 index 10139abc..00000000 --- a/behave/fixtures/pac/test-pkgB-2.changes +++ /dev/null @@ -1,4 +0,0 @@ -------------------------------------------------------------------- -Wed Feb 2 11:22:33 UTC 2022 - Geeko Packager - -- Release upstream version 2 diff --git a/behave/fixtures/pac/test-pkgB-2.changes b/behave/fixtures/pac/test-pkgB-2.changes new file mode 120000 index 00000000..64c40ab0 --- /dev/null +++ b/behave/fixtures/pac/test-pkgB-2.changes @@ -0,0 +1 @@ +../../container-files/opt/setup/fixtures/pac/test-pkgB-2.changes \ No newline at end of file diff --git a/behave/fixtures/pac/test-pkgB-2.spec b/behave/fixtures/pac/test-pkgB-2.spec deleted file mode 100644 index f86ba973..00000000 --- a/behave/fixtures/pac/test-pkgB-2.spec +++ /dev/null @@ -1,25 +0,0 @@ -Name: test-pkgB -Version: 2 -Release: 1 -License: GPL-2.0 -Summary: Test package -URL: https://example.com/test-package/ - - -BuildArch: noarch - - -%description -desc - - -%prep - - -%install - - -%files - - -%changelog diff --git a/behave/fixtures/pac/test-pkgB-2.spec b/behave/fixtures/pac/test-pkgB-2.spec new file mode 120000 index 00000000..754c3a44 --- /dev/null +++ b/behave/fixtures/pac/test-pkgB-2.spec @@ -0,0 +1 @@ +../../container-files/opt/setup/fixtures/pac/test-pkgB-2.spec \ No newline at end of file