Merge branch 'dev' into iss34-CheckAvailCacheSizeForDownload

vmware · Jul 7, 2022 · 002ec08 · 002ec08
2 parents fb9b995 + 00b8ee8
commit 002ec08
Show file tree

Hide file tree

Showing 39 changed files with 2,874 additions and 166 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -17,21 +17,7 @@ jobs:
               working-directory: ${{ github.workspace }}
               run: |
                 docker run --privileged --security-opt seccomp:unconfined --rm -e DIST -v$(pwd):/build -w/build ${DIST}/tdnf-build ./ci/docker-entrypoint.sh
-    photon-3:
-        env:
-            DIST: photon
-            DIST_VERSION: '3.0'
-        runs-on: ubuntu-latest
-        steps:
-            - uses: actions/checkout@v2
-            - name: build container
-              working-directory: ${{ github.workspace }}
-              run: |
-                docker build -t ${DIST}/tdnf-build:${DIST_VERSION} -f ci/Dockerfile.${DIST}-${DIST_VERSION} .
-            - name: run container with tests
-              working-directory: ${{ github.workspace }}
-              run: |
-                docker run --privileged --security-opt seccomp:unconfined --rm -e DIST -v$(pwd):/build -w/build ${DIST}/tdnf-build:${DIST_VERSION} ./ci/docker-entrypoint.sh
+
     fedora:
         env:
             DIST: fedora

diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -59,6 +59,7 @@ find_package(PkgConfig REQUIRED)
 pkg_check_modules(RPM REQUIRED rpm)
 find_package(OpenSSL REQUIRED)
 pkg_check_modules(LIBXML2 REQUIRED libxml-2.0)
+pkg_check_modules(SQLITE3 sqlite3)
 include_directories(${RPM_INCLUDE_DIRS})
 include_directories(${LIBXML2_INCLUDE_DIRS})
 
@@ -74,11 +75,13 @@ set(LIB_TDNF "tdnf")
 set(LIB_TDNF_SOLV "tdnfsolv")
 set(LIB_TDNF_COMMON "common")
 set(LIB_TDNF_JSONDUMP "jsondump")
+set(LIB_TDNF_HISTORY "history")
 set(LIB_TDNF_CLI tdnfcli)
 
 add_subdirectory("${PROJECT_SOURCE_DIR}/common")
 add_subdirectory("${PROJECT_SOURCE_DIR}/client")
 add_subdirectory("${PROJECT_SOURCE_DIR}/jsondump")
+add_subdirectory("${PROJECT_SOURCE_DIR}/history")
 add_subdirectory("${PROJECT_SOURCE_DIR}/plugins")
 add_subdirectory("${PROJECT_SOURCE_DIR}/python")
 add_subdirectory("${PROJECT_SOURCE_DIR}/etc")

diff --git a/ci/Dockerfile.fedora b/ci/Dockerfile.fedora
@@ -5,9 +5,12 @@ RUN dnf -y install gcc make cmake libcurl-devel rpm-devel rpm-build \
         libsolv-devel popt-devel sed createrepo_c glib2-devel libxml2 \
         findutils python3-pytest python3-requests python3-urllib3 \
         python3-pyOpenSSL python3 python3-devel valgrind gpgme-devel \
-        libxml2-devel openssl-devel rpm-sign which python3-pip \
+        libxml2-devel openssl-devel sqlite-devel rpm-sign which python3-pip \
         shadow-utils sudo e2fsprogs util-linux
 
+
 RUN pip3 install flake8
 
+RUN mkdir -p /var/lib/tdnf
+
 CMD ["/bin/bash"]
diff --git a/ci/Dockerfile.photon b/ci/Dockerfile.photon
@@ -7,11 +7,14 @@ RUN tdnf install -y --enablerepo=photon-debuginfo \
                libsolv-devel popt-devel sed createrepo_c glib libxml2 \
                findutils python3 python3-pip python3-setuptools \
                python3-devel valgrind gpgme-devel glibc-debuginfo \
-               libxml2-devel openssl-devel zlib-devel which \
+               libxml2-devel openssl-devel zlib-devel sqlite-devel \
                python3-requests python3-urllib3 python3-pyOpenSSL \
-               sudo shadow e2fsprogs util-linux
+               sudo shadow which e2fsprogs util-linux
+
 
 # this can to be removed once latest pytest gets published in photon
 RUN pip3 install pytest flake8
 
+RUN mkdir -p /var/lib/tdnf
+
 CMD ["/bin/bash"]
diff --git a/ci/Dockerfile.photon-3.0 b/ci/Dockerfile.photon-3.0
@@ -7,11 +7,14 @@ RUN tdnf install -y --enablerepo=photon-debuginfo \
                libsolv-devel popt-devel sed createrepo_c glib libxml2 \
                findutils python3 python3-setuptools python3-devel \
                valgrind gpgme-devel glibc-debuginfo libxml2-devel \
-               openssl-devel zlib-devel which python3-requests \
+               openssl-devel zlib-devel sqlite-devel python3-requests \
                python3-urllib3 python3-pyOpenSSL python3-pip \
-               sudo shadow e2fsprogs util-linux
+               sudo shadow which e2fsprogs util-linux
+
 
 # TODO: we need to fix pytest in Ph3, after that this can be removed
 RUN pip3 install pytest flake8
 
+RUN mkdir -p /var/lib/tdnf
+
 CMD ["/bin/bash"]
diff --git a/client/CMakeLists.txt b/client/CMakeLists.txt
@@ -42,11 +42,13 @@ add_library(${LIB_TDNF} SHARED
     utils.c
     metalink.c
     list.c
+    history.c
 )
 
 target_link_libraries(${LIB_TDNF}
     ${LIB_TDNF_COMMON}
     ${LIB_TDNF_SOLV}
+    ${LIB_TDNF_HISTORY}
     ${RPM_LIBRARIES}
     ${LibSolv_LIBRARIES}
     ${CURL_LIBRARIES}