Fix CI username

.github/workflows/e2e.yaml

@@ -7,6 +7,10 @@ on:
   schedule:
     - cron: '0 4 * * *'
 
+concurrency:
+  group: ${{ github.workflow }}-${{ github.ref }}
+  cancel-in-progress: ${{ github.event_name == 'pull_request' }}
+
 jobs:
   buildbox:
     strategy:
@@ -123,6 +127,7 @@ jobs:
     name: Package test package=${{ matrix.package }} dist=${{ matrix.dist }} arch=${{ matrix.arch }}
     env:
       OOD_REPO_PASSWORD: ${{ secrets.OOD_OSC_EARLY_ACCESS_PASSWORD }}
+      OOD_REPO_USERNAME: ${{ secrets.OOD_OSC_EARLY_ACCESS_USERNAME }}
     steps:
       - name: Checkout ${{ github.sha	}}
         uses: actions/checkout@v7
@@ -291,6 +296,7 @@ jobs:
     name: Package ${{ matrix.package }} dist=${{ matrix.dist }} arch=${{ matrix.arch }}
     env:
       OOD_REPO_PASSWORD: ${{ secrets.OOD_OSC_EARLY_ACCESS_PASSWORD }}
+      OOD_REPO_USERNAME: ${{ secrets.OOD_OSC_EARLY_ACCESS_USERNAME }}
     steps:
       - name: Checkout ${{ github.sha	}}
         uses: actions/checkout@v7

.github/workflows/release.yaml

@@ -74,7 +74,7 @@ jobs:
       - name: Setup Ruby using Bundler
         uses: ruby/setup-ruby@v1
         with:
-          ruby-version: '3.0.4'
+          ruby-version: '3.0'
           bundler: '2.1.4'
           bundler-cache: true
       - name: Setup Rubygems credentials

.github/workflows/unit.yaml

@@ -5,13 +5,17 @@ on:
     branches: [main]
   pull_request:
 
+concurrency:
+  group: ${{ github.workflow }}-${{ github.ref }}
+  cancel-in-progress: ${{ github.event_name == 'pull_request' }}
+
 jobs:
   unit-tests:
     strategy:
       fail-fast: false
       matrix:
         os: ["ubuntu-latest"]
-        ruby: ["3.2.2", "3.3.8", 4.0.6]
+        ruby: ["3.2", "3.3", "4.0.6"]
         bundler: ["2.5.23"]
     runs-on: ${{ matrix.os }}
     name: Unit tests

Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    ood_packaging (0.23.3)
+    ood_packaging (0.23.4)
       ostruct
       rake (~> 13.0)
 

lib/ood_packaging/utils.rb

@@ -63,7 +63,7 @@ def ondemand_rpm_repo_baseurl
   end
 
   def ondemand_rpm_repo_username
-    ENV['OOD_REPO_USERNAME'] || 'osc'
+    ENV['OOD_REPO_USERNAME'] || 'osc-ci'
   end
 
   def ruby_version

lib/ood_packaging/version.rb

@@ -2,7 +2,7 @@
 
 # Version code for OodPackaging
 module OodPackaging
-  VERSION = '0.23.3'
+  VERSION = '0.23.4'
   PACKAGE_VERSION = {
     'ondemand-release'        => {
       '(ubuntu|debian)' => '4.2.0',

spec/ood_packaging/package_spec.rb

@@ -198,7 +198,7 @@
         '-e', "'GPG_SIGN=false'", '-e', "'GPG_NAME=OnDemand Release Signing Key'",
         '-e', "'OOD_UID=1000'", '-e', "'OOD_GID=1000'",
         '-e', "'DEBUG=false'",
-        '-e', "'DNF_VAR_REPO_USERNAME=osc'",
+        '-e', "'DNF_VAR_REPO_USERNAME=osc-ci'",
         'uuid', '/ondemand-packaging/inituidgid.sh', '/ondemand-packaging/setuser.rb', 'ood',
         '/ondemand-packaging/rake', '-q', '-f', '/ondemand-packaging/Rakefile', 'ood_packaging:package:build'
       ]
@@ -217,7 +217,7 @@
           '-e', "'GPG_SIGN=false'", '-e', "'GPG_NAME=OnDemand Release Signing Key'",
           '-e', "'OOD_UID=1000'", '-e', "'OOD_GID=1000'",
           '-e', "'DEBUG=false'",
-          '-e', "'DNF_VAR_REPO_USERNAME=osc'",
+          '-e', "'DNF_VAR_REPO_USERNAME=osc-ci'",
           'uuid', '/ondemand-packaging/inituidgid.sh', '/ondemand-packaging/setuser.rb', 'ood',
           '/ondemand-packaging/rake', '-q', '-f', '/ondemand-packaging/Rakefile', 'ood_packaging:package:build'
         ]