Install j2cli with apt (#436)

Author: sebrandon1

.github/actions/create-local-test-infra-resources/action.yaml

@@ -28,6 +28,11 @@ runs:
   steps:
     - name: Create `local-test-infra` OpenShift resources
       run: |
+        python3 -m venv .venv
+        source .venv/bin/activate
+        pip install --upgrade pip
+        pip install jinjanator
+        cp .venv/bin/jinjanate .venv/bin/j2
         make install
       working-directory: ${{ inputs.working_directory }}
       shell: bash

.github/actions/start-k8s-cluster/action.yaml

@@ -19,11 +19,6 @@ runs:
       working-directory: ${{ inputs.working_directory }}
       shell: bash
 
-    - name: Run Bootstrap Python
-      run: make bootstrap-python-ubuntu-local
-      working-directory: ${{ inputs.working_directory }}
-      shell: bash
-
     - name: Start the cluster
       run: make rebuild-cluster
       working-directory: ${{ inputs.working_directory }}

.github/workflows/cnf-test-partner-image.yaml

@@ -23,7 +23,7 @@ env:
 jobs:
   test-cnf-test-partner-image:
     name: 'Build and test the `cnf-test-partner` image'
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-24.04
 
     steps:
       - uses: actions/checkout@v4
@@ -45,7 +45,7 @@ jobs:
     if: ${{ github.ref == 'refs/heads/main' }}
     name: 'Push the new `cnf-test-partner` image to Quay.io'
     needs: test-cnf-test-partner-image
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-24.04
 
     steps:
       - name: Checkout the main branch

.github/workflows/debug-partner-image.yaml

@@ -24,7 +24,7 @@ env:
 jobs:
   test-debug-partner-image:
     name: 'Build and test the `debug-partner` image'
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-24.04
 
     steps:
       - uses: actions/checkout@v4

.github/workflows/local-test-infra.yaml

@@ -7,7 +7,7 @@ defaults:
 jobs:
   shellcheck:
     name: Shellcheck
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-24.04
     steps:
       - uses: actions/checkout@v4
       - name: Run ShellCheck
@@ -17,7 +17,7 @@ jobs:
           severity: error
   test-local-test-infra:
     name: 'Test the `local-test-infra` configuration on k8s cluster'
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-24.04
     env:
       TNF_NAMESPACE: tnf
       PUT_CONTAINER_NAME: test

.github/workflows/pre-main.yml

@@ -24,7 +24,7 @@ env:
   SMOKE_TESTS_LABELS_FILTER: all
 jobs:
   linters:
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-24.04
     steps:
       - uses: actions/checkout@v4
       - uses: hadolint/[email protected]
@@ -59,7 +59,7 @@ jobs:
                 level: warning
   smoke-tests:
     name: Run Smoke Tests
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-24.04
     env:
       SHELL: /bin/bash
       KUBECONFIG: '/home/runner/.kube/config'
@@ -69,6 +69,12 @@ jobs:
       # Restart docker using /mnt/docker-storage (sdb) instead of /var/lib/docker (sda).
       # This step needs to be done right after the partner repo's bootstrap scripts, as they
       # overwrite the docker's daemon.json.
+      - name: Create docker/daemon.json if it does not exist
+        run: |
+          if [ ! -f /etc/docker/daemon.json ]; then
+            echo '{}' | sudo tee /etc/docker/daemon.json
+          fi
+
       - name: Make docker to use /mnt (sdb) for storage
         run: |
           df -h

.github/workflows/preflight.yml

@@ -9,7 +9,7 @@ name: Preflight
 
 jobs:
   preflight-debug-partner:
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-24.04
     env:
       SHELL: /bin/bash
       IMAGE_NAME: quay.io/testnetworkfunction/debug-partner:latest
@@ -50,7 +50,7 @@ jobs:
 
 
   preflight-cnf-test-partner:
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-24.04
     env:
       SHELL: /bin/bash
       IMAGE_NAME: quay.io/testnetworkfunction/cnf-test-partner:latest

Makefile

@@ -43,14 +43,6 @@ bootstrap-docker-fedora-local:
 bootstrap-docker-ubuntu-local:
 	cd config/vagrant/scripts && ./bootstrap-docker-ubuntu.sh
 
-# Bootstrap Python (Ubuntu)
-bootstrap-python-ubuntu-local:
-	cd config/vagrant/scripts && ./bootstrap-python-ubuntu.sh
-
-# Bootstrap Python (Fedora)
-bootstrap-python-fedora-local:
-	cd config/vagrant/scripts && ./bootstrap-python-fedora.sh
-
 # Bootstrap Golang (Fedora)
 bootstrap-golang-fedora-local:
 	cd config/vagrant/scripts && ./bootstrap-golang-fedora.sh

config/vagrant/scripts/bootstrap-docker-fedora.sh

@@ -25,6 +25,10 @@ sudo dnf -y install docker-ce docker-ce-cli containerd.io jq
 
 # Configure IPv6 in docker ( https://docs.docker.com/config/daemon/ipv6/ )
 sudo mkdir /etc/docker
+
+# Create the daemon.json file if it does not exist
+sudo touch -a /etc/docker/daemon.json
+
 sudo bash -c 'cat <<- EOF > /etc/docker/daemon.json
 {
   "ipv6": true,

config/vagrant/scripts/bootstrap-docker-ubuntu.sh

@@ -1,5 +1,8 @@
 #!/usr/bin/env bash
 
+# create the docker daemon json file if it does not exist
+sudo touch -a /etc/docker/daemon.json
+
 # update docker config to include ipv6 support
 jq '. +={"ipv6": true, "fixed-cidr-v6": "2001:db8:1::/64"}' /etc/docker/daemon.json > /tmp/new-docker-daemon.json
 sudo cp /tmp/new-docker-daemon.json /etc/docker/daemon.json