Merge pull request #1883 from cnti-testcatalog/fix_ci

Fix CI #1880 #1879 #1878 #1874 #1806

Author: wvwatson

.github/workflows/actions.yml

@@ -27,9 +27,9 @@ get_latest_release() {
 }
 
 # Install CNF-TestSuite
-LATEST_RELEASE=$(get_latest_release cncf/cnf-testsuite)
+LATEST_RELEASE=$(get_latest_release cnti-testcatalog/testsuite)
 mkdir -p ~/.cnf-testsuite
-curl --silent -L https://github.com/cncf/cnf-testsuite/releases/download/$LATEST_RELEASE/cnf-testsuite-$LATEST_RELEASE.tar.gz -o ~/.cnf-testsuite/cnf-testsuite.tar.gz
+curl --silent -L https://github.com/cnti-testcatalog/testsuite/releases/download/$LATEST_RELEASE/cnf-testsuite-$LATEST_RELEASE.tar.gz -o ~/.cnf-testsuite/cnf-testsuite.tar.gz
 tar -C ~/.cnf-testsuite -xf ~/.cnf-testsuite/cnf-testsuite.tar.gz
 rm ~/.cnf-testsuite/cnf-testsuite.tar.gz
 

curl_install.sh

@@ -51,8 +51,9 @@ module UERANSIM
         Log.info { "Found ueransim ... deleting" }
         Helm.delete("ueransim")
       end
-      Helm.helm_repo_add("openverso","https://gradiant.github.io/openverso-charts/")
-      Helm.fetch("openverso/ueransim-gnb --version 0.2.5 --untar")
+      #Helm.helm_repo_add("openverso","https://gradiant.github.io/openverso-charts/")
+      # Helm.fetch("openverso/ueransim-gnb --version 0.2.5 --untar")
+      Helm.fetch("oci://registry-1.docker.io/gradiant/ueransim-gnb --version 0.2.5 --untar")
 
       protectionScheme = config.cnf_config[:fiveG_core][:protectionScheme]
       unless protectionScheme.empty?

src/tasks/utils/ueransim.cr

@@ -1,4 +1,4 @@
-FROM myoung34/github-runner:2.303.0-ubuntu-bionic
+FROM myoung34/github-runner:2.313.0-ubuntu-bionic
 
 ARG CRYSTAL_VERSION=1.6.2
 ARG CRYSTAL_URL=https://github.com/crystal-lang/crystal/releases/download
@@ -11,7 +11,7 @@ RUN curl -fsSL https://cli.github.com/packages/githubcli-archive-keyring.gpg --o
 
 RUN mkdir /crystal && \
     wget -O /crystal/crystal.tar.gz "$CRYSTAL_URL/$CRYSTAL_VERSION/crystal-$CRYSTAL_VERSION-1-linux-x86_64.tar.gz" --progress=dot:giga && \
-    tar -xf /crystal/crystal.tar.gz -C /tmp && \
+    tar -xf /crystal/crystal.tar.gz -C /crystal && \
     chmod +x /crystal/crystal-${CRYSTAL_VERSION}-1/bin/crystal && \
     chmod +x /crystal/crystal-${CRYSTAL_VERSION}-1/bin/shards && \
     ln -s /crystal/crystal-${CRYSTAL_VERSION}-1/bin/crystal /usr/local/bin/crystal && \

tools/github-runner/Dockerfile

@@ -3,15 +3,7 @@
 RUNNERS=(
     136.144.55.87
     136.144.55.243
-    139.178.69.151
-    139.178.69.153
-    139.178.68.167
-    86.109.1.243
-    139.178.68.111
-    139.178.68.103
-    139.178.68.93
-    139.178.68.107
-    136.144.54.249)
+    139.178.69.151)
 
 
 #TOKEN=$(curl  -XPOST -H "authorization: token ${GITHUB_TOKEN}" https://api.github.com/repos/cncf/cnf-testsuite/actions/runners/registration-token | jq -r .token)

tools/github-runner/cleanup_runners.sh

@@ -1,39 +1,23 @@
 #!/bin/bash
 
 RUNNERS=(
-    136.144.55.87
-    136.144.55.243
-    139.178.69.151
-    139.178.69.153
-    139.178.68.167
-    86.109.1.243
-    139.178.68.111
-    139.178.68.103
-    139.178.68.93
-    139.178.68.107
-    136.144.54.249)
+       136.144.55.87
+       136.144.55.243
+       139.178.69.151)
 
 VIPS=(
     147.75.89.176/28
     147.75.108.64/28
-    147.75.202.0/28
-    147.75.202.80/28
-    147.75.88.0/28
-    147.75.202.112/28
-    147.75.203.112/28
-    147.75.203.144/28
-    147.75.203.160/28
-    147.75.203.176/28
-    147.75.203.192/28)
+    147.75.202.0/28)
 
 
 RUNNER_COUNT=0
 for node in "${!RUNNERS[@]}"; do
-    export RUNNER_IMAGE="conformance/github-runner:v2.303.0-4" # don't forget the v
+    export RUNNER_IMAGE="conformance/github-runner:v2.313.0" # don't forget the v
     ssh root@${RUNNERS[$node]} "docker pull $RUNNER_IMAGE"
     RUNNERS_PER_NODE=4
     until [ $RUNNERS_PER_NODE -eq 0 ]; do
-        ssh root@${RUNNERS[$node]} "docker run -d --network host --restart always --name github-runner$RUNNER_COUNT -e REPO_URL="https://github.com/cncf/cnf-testsuite" -e RUNNER_NAME="runner$RUNNER_COUNT" -e RUNNER_TOKEN="$TOKEN" -e RUNNER_WORKDIR="/github-runner-cnf-testsuite" -e LABELS="v1.0.0" -v /var/run/docker.sock:/var/run/docker.sock -v /runner-tmp/runner$RUNNER_COUNT:/tmp -v /github-runner-cnf-testsuite/cnf-testsuite/cnf-testsuite/tools:/docker-host-repo/tools -v /shared:/shared $RUNNER_IMAGE"
+        ssh root@${RUNNERS[$node]} "docker run -d --network host --restart always --name github-runner$RUNNER_COUNT -e REPO_URL="https://github.com/cnti-testcatalog/testsuite" -e RUNNER_NAME="runner$RUNNER_COUNT" -e RUNNER_TOKEN="$TOKEN" -e RUNNER_WORKDIR="/github-runner-cnf-testsuite" -e LABELS="v1.0.0" -v /var/run/docker.sock:/var/run/docker.sock -v /runner-tmp/runner$RUNNER_COUNT:/tmp -v /github-runner-cnf-testsuite/cnf-testsuite/cnf-testsuite/tools:/docker-host-repo/tools -v /shared:/shared $RUNNER_IMAGE"
         RUNNER_COUNT=$(($RUNNER_COUNT + 1))
         RUNNERS_PER_NODE=$(($RUNNERS_PER_NODE - 1))
     done