Merge pull request #64 from otg-staging/main

Updating dependencies
open-traffic-generator · Nov 23, 2023 · 100e5f6 · 100e5f6
2 parents ee06d32 + bb4af99
commit 100e5f6
Show file tree

Hide file tree

Showing 5 changed files with 17 additions and 14 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -79,7 +79,7 @@ jobs:
       clab-rtbh: ${{ steps.changes.outputs.clab-rtbh }}
       hybrid-fp-b2b: ${{ steps.changes.outputs.hybrid-fp-b2b }}
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
         with:
           submodules: 'true'
       - uses: dorny/paths-filter@v2
@@ -145,7 +145,7 @@ jobs:
         working-directory: ./docker-compose/b2b
     if: needs.paths-filter.outputs.docker-compose-b2b == 'true'
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
         with:
           submodules: 'true'
       - name: Run all
@@ -159,7 +159,7 @@ jobs:
         working-directory: ./docker-compose/b2b-3pair
     if: needs.paths-filter.outputs.docker-compose-b2b-3pair == 'true'
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
         with:
           submodules: 'true'
       - name: Run all
@@ -173,7 +173,7 @@ jobs:
         working-directory: ./docker-compose/cpdp-b2b
     if: needs.paths-filter.outputs.docker-compose-cpdp-b2b == 'true'
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
         with:
           submodules: 'true'
       - name: Run all
@@ -187,7 +187,7 @@ jobs:
         working-directory: ./docker-compose/cpdp-frr
     if: needs.paths-filter.outputs.docker-compose-cpdp-frr == 'true'
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
         with:
           submodules: 'true'
       - name: Run all
@@ -201,7 +201,7 @@ jobs:
         working-directory: ./clab/cpdp-frr
     if: needs.paths-filter.outputs.clab-cpdp-frr == 'true'
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
         with:
           submodules: 'true'
       - name: Run all-clab
@@ -215,7 +215,7 @@ jobs:
         working-directory: ./clab/ixia-c-b2b
     if: needs.paths-filter.outputs.clab-ixia-c-b2b == 'true'
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
         with:
           submodules: 'true'
       - name: Run all
@@ -229,7 +229,7 @@ jobs:
         working-directory: ./clab/ixia-c-b2b-lag
     if: needs.paths-filter.outputs.clab-ixia-c-b2b-lag == 'true'
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
         with:
           submodules: 'true'
       - name: Run all
@@ -243,7 +243,7 @@ jobs:
         working-directory: ./clab/ixia-c-te-frr
     if: needs.paths-filter.outputs.clab-ixia-c-te-frr == 'true'
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
         with:
           submodules: 'true'
       - name: Run all
@@ -257,7 +257,7 @@ jobs:
         working-directory: ./clab/rtbh
     if: needs.paths-filter.outputs.clab-rtbh == 'true'
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
         with:
           submodules: 'true'
       - name: Set up Go
@@ -277,7 +277,7 @@ jobs:
         working-directory: ./hybrid/fp-b2b
     if: needs.paths-filter.outputs.hybrid-fp-b2b == 'true'
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
         with:
           submodules: 'true'
       - name: Create GO cache

diff --git a/clab/rtbh/Dockerfile b/clab/rtbh/Dockerfile
@@ -1,4 +1,4 @@
-FROM golang:1.19
+FROM golang:1.21
 
 RUN mkdir /otg
 WORKDIR /otg

diff --git a/clab/rtbh/go.mod b/clab/rtbh/go.mod
@@ -4,7 +4,7 @@ go 1.19
 
 require (
 	github.com/open-traffic-generator/snappi/gosnappi v0.13.0
-	github.com/sirupsen/logrus v1.8.1
+	github.com/sirupsen/logrus v1.9.3
 	github.com/vbauerster/mpb/v7 v7.4.1
 )
 

diff --git a/clab/rtbh/go.sum b/clab/rtbh/go.sum
@@ -989,6 +989,8 @@ github.com/ruudk/golang-pdf417 v0.0.0-20181029194003-1af4ab5afa58/go.mod h1:6lfF
 github.com/ruudk/golang-pdf417 v0.0.0-20201230142125-a7e3863a1245/go.mod h1:pQAZKsJ8yyVxGRWYNEm9oFB8ieLgKFnamEyDmSA0BRk=
 github.com/sirupsen/logrus v1.8.1 h1:dJKuHgqk1NNQlqoA6BTlM1Wf9DOH3NBjQyu0h9+AZZE=
 github.com/sirupsen/logrus v1.8.1/go.mod h1:yWOB1SBYBC5VeMP7gHvWumXLIWorT60ONWic61uBYv0=
+github.com/sirupsen/logrus v1.9.3 h1:dueUQJ1C2q9oE3F7wvmSGAaVtTmUizReu6fjN8uqzbQ=
+github.com/sirupsen/logrus v1.9.3/go.mod h1:naHLuLoDiP4jHNo9R0sCBMtWGeIprob74mVsIT4qYEQ=
 github.com/spaolacci/murmur3 v0.0.0-20180118202830-f09979ecbc72/go.mod h1:JwIasOWyU6f++ZhiEuf87xNszmSA2myDM2Kzu9HwQUA=
 github.com/spf13/afero v1.3.3/go.mod h1:5KUK8ByomD5Ti5Artl0RtHeI5pTF7MIDuXL3yY520V4=
 github.com/spf13/afero v1.6.0/go.mod h1:Ai8FlHk4v/PARR026UzYexafAt9roJ7LcLMAmO6Z93I=
@@ -1285,6 +1287,7 @@ golang.org/x/sys v0.0.0-20220520151302-bc2c85ada10a/go.mod h1:oPkhp1MJrh7nUepCBc
 golang.org/x/sys v0.0.0-20220610221304-9f5ed59c137d/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.0.0-20220615213510-4f61da869c0c/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.0.0-20220624220833-87e55d714810/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+golang.org/x/sys v0.0.0-20220715151400-c0bba94af5f8/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.0.0-20220722155257-8c9f86f7a55f/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.0.0-20220728004956-3c1f35247d10/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.0.0-20220811171246-fbc7d0a398ab/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=

diff --git a/docker-compose/cpdp-frr/compose.yml b/docker-compose/cpdp-frr/compose.yml
@@ -45,7 +45,7 @@ services:
     environment:
     - INTF_LIST=veth2
   frr:
-    image: quay.io/frrouting/frr:8.4.2
+    image: quay.io/frrouting/frr:9.0.1
     cap_add:
       - NET_ADMIN
       - NET_RAW