Merge pull request #221 from saschagrunert/new-obs

Switch to new OBS subprojects
cri-o · Feb 13, 2025 · aee1b57 · aee1b57
2 parents e8f90d7 + b133393
commit aee1b57
Show file tree

Hide file tree

Showing 7 changed files with 99 additions and 81 deletions.
diff --git a/README.md b/README.md
diff --git a/scripts/reconcile b/scripts/reconcile
@@ -20,7 +20,7 @@ install_osc
 setup_osc
 
 PACKAGES=$(osc se --package cri-o)
-PROJECT_PREFIX=isv:kubernetes:addons:cri-o
+PROJECT_PREFIX=isv:cri-o
 PROJECT_PRERELEASE_PREFIX=$PROJECT_PREFIX:prerelease
 BUILD_PROJECT_SUFFIX=:build/cri-o
 BRANCH_MAIN=main

diff --git a/scripts/vars b/scripts/vars
@@ -11,7 +11,7 @@ fi
 
 GIT_ROOT=$(git rev-parse --show-toplevel)
 ARCHIVE_PATH="$GIT_ROOT/build/bundle"
-PROJECT_ROOT=isv:kubernetes:addons:cri-o
+PROJECT_ROOT=isv:cri-o
 CRIO_MAIN_BRANCH=main
 REVISION=${REVISION:-$CRIO_MAIN_BRANCH}
 

diff --git a/test/deb/lima.yaml b/test/deb/lima.yaml
@@ -27,8 +27,8 @@ provision:
 
         curl -fsSL https://pkgs.k8s.io/core:/stable:/$KUBERNETES_VERSION/deb/Release.key | gpg --dearmor -o /etc/apt/keyrings/kubernetes-apt-keyring.gpg
         echo "deb [signed-by=/etc/apt/keyrings/kubernetes-apt-keyring.gpg] https://pkgs.k8s.io/core:/stable:/$KUBERNETES_VERSION/deb/ /" | tee /etc/apt/sources.list.d/kubernetes.list
-        curl -fsSL https://download.opensuse.org/repositories/isv:/kubernetes:/addons:/cri-o:/"$PROJECT_PATH":/build/deb/Release.key | gpg --dearmor -o /etc/apt/keyrings/cri-o-apt-keyring.gpg
-        echo "deb [signed-by=/etc/apt/keyrings/cri-o-apt-keyring.gpg] https://download.opensuse.org/repositories/isv:/kubernetes:/addons:/cri-o:/$PROJECT_PATH:/build/deb/ /" | tee /etc/apt/sources.list.d/cri-o.list
+        curl -fsSL https://download.opensuse.org/repositories/isv:/cri-o:/"$PROJECT_PATH":/build/deb/Release.key | gpg --dearmor -o /etc/apt/keyrings/cri-o-apt-keyring.gpg
+        echo "deb [signed-by=/etc/apt/keyrings/cri-o-apt-keyring.gpg] https://download.opensuse.org/repositories/isv:/cri-o:/$PROJECT_PATH:/build/deb/ /" | tee /etc/apt/sources.list.d/cri-o.list
         apt-get update
 
         apt-get install -y cri-o kubelet kubeadm kubectl

diff --git a/test/rpm/lima.yaml b/test/rpm/lima.yaml
@@ -39,10 +39,10 @@ provision:
         cat <<EOF | tee /etc/yum.repos.d/cri-o.repo
       [cri-o]
       name=CRI-O
-      baseurl=https://download.opensuse.org/repositories/isv:/kubernetes:/addons:/cri-o:/$PROJECT_PATH:/build/rpm/
+      baseurl=https://download.opensuse.org/repositories/isv:/cri-o:/$PROJECT_PATH:/build/rpm/
       enabled=1
       gpgcheck=1
-      gpgkey=https://download.opensuse.org/repositories/isv:/kubernetes:/addons:/cri-o:/$PROJECT_PATH:/build/rpm/repodata/repomd.xml.key
+      gpgkey=https://download.opensuse.org/repositories/isv:/cri-o:/$PROJECT_PATH:/build/rpm/repodata/repomd.xml.key
       EOF
 
         # Official package dependencies

diff --git a/test/scripts/install-deb.sh b/test/scripts/install-deb.sh
@@ -23,8 +23,8 @@ if [ -z $CRIO_ONLY ]; then
     curl -fsSL https://pkgs.k8s.io/core:/stable:/$KUBERNETES_VERSION/deb/Release.key | gpg --dearmor -o /etc/apt/keyrings/kubernetes-apt-keyring.gpg
     echo "deb [signed-by=/etc/apt/keyrings/kubernetes-apt-keyring.gpg] https://pkgs.k8s.io/core:/stable:/$KUBERNETES_VERSION/deb/ /" | tee /etc/apt/sources.list.d/kubernetes.list
 fi
-curl -fsSL https://download.opensuse.org/repositories/isv:/kubernetes:/addons:/cri-o:/"$PROJECT_PATH":/build/deb/Release.key | gpg --dearmor -o /etc/apt/keyrings/cri-o-apt-keyring.gpg
-echo "deb [signed-by=/etc/apt/keyrings/cri-o-apt-keyring.gpg] https://download.opensuse.org/repositories/isv:/kubernetes:/addons:/cri-o:/$PROJECT_PATH:/build/deb/ /" | tee /etc/apt/sources.list.d/cri-o.list
+curl -fsSL https://download.opensuse.org/repositories/isv:/cri-o:/"$PROJECT_PATH":/build/deb/Release.key | gpg --dearmor -o /etc/apt/keyrings/cri-o-apt-keyring.gpg
+echo "deb [signed-by=/etc/apt/keyrings/cri-o-apt-keyring.gpg] https://download.opensuse.org/repositories/isv:/cri-o:/$PROJECT_PATH:/build/deb/ /" | tee /etc/apt/sources.list.d/cri-o.list
 
 apt-get update
 

diff --git a/test/scripts/install-rpm.sh b/test/scripts/install-rpm.sh
@@ -33,10 +33,10 @@ fi
 cat <<EOF | tee /etc/yum.repos.d/cri-o.repo
 [cri-o]
 name=CRI-O
-baseurl=https://download.opensuse.org/repositories/isv:/kubernetes:/addons:/cri-o:/$PROJECT_PATH:/build/rpm/
+baseurl=https://download.opensuse.org/repositories/isv:/cri-o:/$PROJECT_PATH:/build/rpm/
 enabled=1
 gpgcheck=1
-gpgkey=https://download.opensuse.org/repositories/isv:/kubernetes:/addons:/cri-o:/$PROJECT_PATH:/build/rpm/repodata/repomd.xml.key
+gpgkey=https://download.opensuse.org/repositories/isv:/cri-o:/$PROJECT_PATH:/build/rpm/repodata/repomd.xml.key
 EOF
 
 dnf install -y cri-o jq