diff --git a/.github/workflows/main.yaml b/.github/workflows/main.yaml index d45daab..40d2b27 100644 --- a/.github/workflows/main.yaml +++ b/.github/workflows/main.yaml @@ -53,7 +53,7 @@ jobs: docker run --rm ${{ env.TEST_TAG }} python3 -m pytest -v test-rpm: - name: Test RPM package + name: Test JSON RPM package runs-on: ubuntu-latest needs: build steps: @@ -81,7 +81,7 @@ jobs: ' test-tfc: - name: Test RPM package + name: Test TFC RPM package runs-on: ubuntu-latest needs: [test-json,test-rpm] steps: diff --git a/docker/Dockerfile.rpm b/docker/Dockerfile.rpm index d75bc56..6eb58c8 100644 --- a/docker/Dockerfile.rpm +++ b/docker/Dockerfile.rpm @@ -29,10 +29,12 @@ RUN yum install -y cmake \ RUN mkdir -p /root/rpmbuild/SOURCES RUN wget -O /root/rpmbuild/SOURCES/xrootd-cmstfc.tar.gz https://github.com/opensciencegrid/xrootd-cmstfc/archive/refs/tags/v1.5.2.tar.gz -RUN wget -O /root/rpmbuild/SOURCES/xrootd-cmsjson.tar.gz https://github.com/guyzsarun/xrootd-cmsjson/archive/refs/tags/0.0.1.tar.gz COPY . . +#RUN wget -O /root/rpmbuild/SOURCES/xrootd-cmsjson.tar.gz https://github.com/guyzsarun/xrootd-cmsjson/archive/refs/tags/0.0.1.tar.gz +RUN tar -czf /root/rpmbuild/SOURCES/xrootd-cmsjson.tar.gz --transform=s/xrootd/xrootd-cmsjson-0.0.1/ /xrootd/ + RUN rpmbuild -bb spec/xrootd-cmstfc.spec RUN yum install -y /root/rpmbuild/RPMS/x86_64/xrootd-cmstfc-2.0.0-1.el8.x86_64.rpm \ No newline at end of file