From c563947f683d4eda4b09a4e36921717b6d6f712d Mon Sep 17 00:00:00 2001
From: Felix Schizlein <fschnizlein@suse.com>
Date: Mon, 5 Feb 2024 19:24:54 +0100
Subject: [PATCH] Do not install ci scripts into bin/

---
 .github/workflows/features.yml | 45 ++++++++++++++++------------------
 ci/Dockerfile                  | 12 ---------
 2 files changed, 21 insertions(+), 36 deletions(-)

diff --git a/.github/workflows/features.yml b/.github/workflows/features.yml
index 066ae6eae..9ea0e54b3 100644
--- a/.github/workflows/features.yml
+++ b/.github/workflows/features.yml
@@ -10,39 +10,36 @@ jobs:
     runs-on: ubuntu-latest
     defaults:
       run:
-        shell: bash
         working-directory: /usr/src/rmt-server
     container:
       image: registry.opensuse.org/systemsmanagement/scc/containers/15.5/rmt-ci-container:latest
       options: --user root
-    services:
-      mysql:
-        image: mysql:5.7
-        env:
-          MYSQL_DATABASE: rmt_features
-          MYSQL_USER: rmt
-          MYSQL_PASSWORD: rmt
-          MYSQL_ROOT_PASSWORD: root
-        ports:
-          - 3306:3306
-        options: >-
-          --health-cmd="mysqladmin ping"
-          --health-interval=10s
-          --health-timeout=5s
-          --health-retries=3
+    # services:
+    #   mysql:
+    #     image: mysql:5.7
+    #     env:
+    #       MYSQL_DATABASE: rmt_features
+    #       MYSQL_USER: rmt
+    #       MYSQL_PASSWORD: rmt
+    #       MYSQL_ROOT_PASSWORD: root
+    #     ports:
+    #       - 3306:3306
+    #     options: >-
+    #       --health-cmd="mysqladmin ping"
+    #       --health-interval=10s
+    #       --health-timeout=5s
+    #       --health-retries=3
     steps:
       - uses: actions/checkout@v2
         with:
           fetch-depth: 0
 
-      - name: build rpm
-        run: |
-          rmt-build-rpm
-
-      - name: configure rmt
+      - name: copy checkout to /usr/src/rmt-server
         run: |
-          rmt-configure
+          cp -r $GITHUB_WORKSPACE /usr/src/rmt-server
+          ls -la /usr/src/rmt-server
 
-      - name: run feature tests
+      - name: build rpm
         run: |
-          rmt-run-feature-tests
+          cd /usr/src/rmt-server
+          bash ci/rmt-build-rpm
diff --git a/ci/Dockerfile b/ci/Dockerfile
index e8e5b9fc3..901f0a777 100644
--- a/ci/Dockerfile
+++ b/ci/Dockerfile
@@ -12,20 +12,8 @@ RUN update-alternatives --install /usr/bin/bundle bundle /usr/bin/bundle.ruby2.5
     update-alternatives --install /usr/bin/bundler bundler /usr/bin/bundler.ruby2.5 5
 
 VOLUME /usr/src/rmt-server
-VOLUME /usr/
 
 ARG SCC_USERNAME
 ARG SCC_PASSWORD
 
-# Prepare ruby environment
-ENV NOKOGIRI_USE_SYSTEM_LIBRARIES 1
-
-# Add rmt ci/development scripts
-RUN mkdir -p /usr/src/rmt-server /usr/local/bin
-
-COPY rmt-build-rpm /usr/local/bin/
-COPY rmt-configure /usr/local/bin/
-COPY rmt-console /usr/local/bin/
-COPY rmt-run-feature-tests /usr/local/bin/
-
 WORKDIR /usr/src/rmt-server