Removes fabric-tofino from the fabric.p4 builds
Change-Id: Ia2fcd340ad7c2fe348b467e7c1a37b15159ec784
diff --git a/jjb/repos/fabric-p4.yaml b/jjb/repos/fabric-p4.yaml
index f4bc387..5d7cc72 100644
--- a/jjb/repos/fabric-p4.yaml
+++ b/jjb/repos/fabric-p4.yaml
@@ -9,16 +9,6 @@
# Path in ONOS for fabric.p4 resources
resources_path: 'pipelines/fabric/impl/src/main/resources'
- # BF-SDE version supported by fabric.p4
- sde_ver: '9.0.0'
-
- # BF_SDE repo
- sde_repo: 'opennetworking/bf-sde'
-
- # fabric-tofino project
- fabric_tofino: 'fabric-tofino'
- fabric_tofino_repo: 'https://gerrit.opencord.org/{fabric_tofino}'
-
# fabric-p4test project
fabric_p4test: 'fabric-p4test'
fabric_p4test_repo: 'https://github.com/opennetworkinglab/{fabric_p4test}.git'
@@ -26,9 +16,6 @@
# bmv2 run
bmv2_run: './run/bmv2/run'
- #tm run
- tm_run: './run/tm/run'
-
jobs:
- 'verify-fabric-p4-jobs':
branch-regexp: 'onos-2.*'
diff --git a/jjb/shell/fabric-p4/fabric-p4-build-tofino.sh b/jjb/shell/fabric-p4/fabric-p4-build-tofino.sh
deleted file mode 100644
index e34082b..0000000
--- a/jjb/shell/fabric-p4/fabric-p4-build-tofino.sh
+++ /dev/null
@@ -1,33 +0,0 @@
-#!/usr/bin/env bash
-
-#
-# Copyright 2020-present Open Networking Foundation
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-
-# Build steps for fabric-tofino
-
-# exit on errors
-set -eu -o pipefail
-
-export ONOS_ROOT=`pwd`
-
-echo "Step 3 - Clone ${FABRIC_TOFINO}"
-git clone ${FABRIC_TOFINO_REPO}
-cd ${FABRIC_TOFINO}
-
-echo "Step 4 - Build fabric.p4 for tofino"
-make build SDE_DOCKER_IMG=${SDE_REPO}:${SDE_VER}-p4c
-
-echo "Build for tofino done"
diff --git a/jjb/shell/fabric-p4/fabric-p4-test-tofino.sh b/jjb/shell/fabric-p4/fabric-p4-test-tofino.sh
deleted file mode 100644
index c45d918..0000000
--- a/jjb/shell/fabric-p4/fabric-p4-test-tofino.sh
+++ /dev/null
@@ -1,36 +0,0 @@
-#!/usr/bin/env bash
-
-#
-# Copyright 2020-present Open Networking Foundation
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-
-# Run tests on tm
-
-# exit on errors
-set -eu -o pipefail
-
-SRC_DIR=`pwd`
-export FABRIC_TOFINO=$SRC_DIR/${FABRIC_TOFINO}
-export SDE_DOCKER_IMG=${SDE_REPO}:${SDE_VER}-tm
-
-echo "Step 7 - Run ${FABRIC_P4TEST} on tm"
-cd ${FABRIC_P4TEST}
-${TM_RUN} fabric
-${TM_RUN} fabric-bng
-${TM_RUN} fabric-spgw
-${TM_RUN} fabric-int
-${TM_RUN} fabric-spgw-int
-
-echo "Tests on tm passed"
diff --git a/jjb/templates/fabric-p4-verify.yaml b/jjb/templates/fabric-p4-verify.yaml
index b88d3bb..67e3583 100644
--- a/jjb/templates/fabric-p4-verify.yaml
+++ b/jjb/templates/fabric-p4-verify.yaml
@@ -79,20 +79,13 @@
- inject:
properties-content: |
RESOURCES_PATH={resources_path}
- SDE_REPO={sde_repo}
- SDE_VER={sde_ver}
- FABRIC_TOFINO={fabric_tofino}
- FABRIC_TOFINO_REPO={fabric_tofino_repo}
FABRIC_P4TEST={fabric_p4test}
FABRIC_P4TEST_REPO={fabric_p4test_repo}
BMV2_RUN={bmv2_run}
- TM_RUN={tm_run}
- shell: !include-raw-escape: ../shell/fabric-p4/fabric-p4-pre.sh
- shell: !include-raw-escape: ../shell/fabric-p4/fabric-p4-build-bmv2.sh
- - shell: !include-raw-escape: ../shell/fabric-p4/fabric-p4-build-tofino.sh
- shell: !include-raw-escape: ../shell/fabric-p4/fabric-p4-p4test.sh
- shell: !include-raw-escape: ../shell/fabric-p4/fabric-p4-test-bmv2.sh
- - shell: !include-raw-escape: ../shell/fabric-p4/fabric-p4-test-tofino.sh
publishers:
- onf-infra-wscleanup-publisher