Remove T3 from the build
T3 is intentionally left out until we have more time to work on it.
Change-Id: Ib7a585889fa68af8a68aa8d7fce8967ecdd91ba4
diff --git a/Dockerfile b/Dockerfile
index 3a4516f..b8cda41 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -68,7 +68,6 @@
ARG org_label_schema_build_date=unknown
ARG org_onosproject_onos_version=unknown
ARG org_onosproject_trellis_control_version=unknown
-ARG org_onosproject_trellis_t3_version=unknown
ARG org_omecproject_up4_version=unknown
ARG org_stratumproject_fabric_tna_version=unknown
@@ -80,6 +79,5 @@
org.label-schema.build-date=$org_label_schema_build_date \
org.onosproject.onos.version=$org_onosproject_onos_version \
org.onosproject.trellis-control.version=$org_onosproject_trellis_control_version \
- org.onosproject.trellis-t3.version=$org_onosproject_trellis_t3_version \
org.omecproject.up4.version=$org_omecproject_up4_version \
org.stratumproject.fabric-tna.version=$org_stratumproject_fabric_tna_version
diff --git a/Makefile b/Makefile
index daffb99..3ed4f52 100644
--- a/Makefile
+++ b/Makefile
@@ -87,7 +87,7 @@
export FABRIC_TNA_ROOT := $(shell pwd)/fabric-tna
export FABRIC_TNA_REPO := git@github.com:stratum/fabric-tna.git
-.PHONY: onos trellis-control trellis-t3 up4 fabric-tna
+.PHONY: onos trellis-control up4 fabric-tna
.SILENT: up4 fabric-tna
@@ -216,9 +216,11 @@
fabric-tna-build: mvn_settings.xml .onos-publish-local local-apps fabric-tna ## : Builds fabric-tna using local app
@./app-build.sh $@
-apps: trellis-control trellis-t3 up4 fabric-tna ## : downloads commits, files, and refs from remotes
+## : downloads commits, files, and refs from remotes. Intentionally leave out t3.
+apps: trellis-control up4 fabric-tna
-apps-build: trellis-control-build trellis-t3-build up4-build fabric-tna-build ## : Build the onos apps
+## : Build the onos apps. Intentionally leave out t3.
+apps-build: trellis-control-build up4-build fabric-tna-build
onos: ## : Checkout onos code
if [ ! -d "onos" ]; then \
@@ -287,7 +289,6 @@
--build-arg org_label_schema_build_date="${DOCKER_LABEL_BUILD_DATE}" \
--build-arg org_onosproject_onos_version="$(shell cd ${ONOS_ROOT} && git rev-parse HEAD)"\
--build-arg org_onosproject_trellis_control_version="$(shell cd ${TRELLIS_CONTROL_ROOT} && git rev-parse HEAD)"\
- --build-arg org_onosproject_trellis_t3_version="$(shell cd ${TRELLIS_T3_ROOT} && git rev-parse HEAD)"\
--build-arg org_omecproject_up4_version="$(shell cd ${UP4_ROOT} && git rev-parse HEAD)"\
--build-arg org_stratumproject_fabric_tna_version="$(shell cd ${FABRIC_TNA_ROOT} && git rev-parse HEAD)"\
-f Dockerfile .
diff --git a/README.md b/README.md
index 25e08f2..f6dcb8e 100644
--- a/README.md
+++ b/README.md
@@ -24,7 +24,7 @@
make ONOS_VERSION=ref/changes/72/12345/1 onos-build
```
-Makefile will build also the apps. These are the apps currently integrated in the script: **trellis-control**, **trellis-t3**, **up4** and **fabric-tna**. For each one, there is a **build** target.
+Makefile will build also the apps. These are the apps currently integrated in the script: **trellis-control**, **up4** and **fabric-tna**. For each one, there is a **build** target.
`appname-build` builds with the version specified in the `Makefile.vars.DOCKER_TAG`, using the following sources in order: (1) Maven central (for released versions or snapshots); (2) Local source code (for local branch not yet pushed); (3) Gerrit/Github (for pending review in the form of refs/changes/... or pending pull request). As a prerequisite, the script prepares `mvn_settings.xml` file, creates the `local-apps` folder and checks out the code if it is not present (relies on `appname` target). **APPNAME_VERSION**, defined in `Makefile.vars.DOCKER_TAG` file, can be overridden at runtime.
@@ -63,8 +63,8 @@
`USE_LOCAL_SNAPSHOT_ARTIFACTS=true [DOCKER_TAG=master] make onos-build`
2. Trellis Control, UP4:
`USE_LOCAL_SNAPSHOT_ARTIFACTS=true [DOCKER_TAG=master] make trellis-control-build up4-build`
-3. Trellis T3, Fabric TNA:
- `USE_LOCAL_SNAPSHOT_ARTIFACTS=true [DOCKER_TAG=master] make fabric-tna-build trellis-t3-build`
+3. Fabric TNA:
+ `USE_LOCAL_SNAPSHOT_ARTIFACTS=true [DOCKER_TAG=master] make fabric-tna-build`
4. Final image (`sdfabric-onos`):
`USE_LOCAL_SNAPSHOT_ARTIFACTS=true [DOCKER_TAG=master] make package`
@@ -86,26 +86,19 @@
2.5 Update the `onos-dependencies` to the `ONOS SNAPSHOT` version and push a review
2.6 Write the `ref/changes` path of the step `2.5` in the `Makefile.vars.stable` file
-3. `trellis-t3`
+3. `fabric-tna`
3.1 Identify a stable commit that has been well tested and do reset to that commit
-3.2 Organize the hotfixes as a train (on top of each other)
-3.3 Rebase the train on top of the stable commit
-3.4 Update the `onos-dependencies` to the `ONOS SNAPSHOT` version and the `trellis.api` version to the `trellis-control SNAPSHOT` version and push a review
-3.5 Write the `ref/changes` path of the step `3.4` in the `Makefile.vars.stable` file
+3.2 Create a branch out of the stable commit; update the `onos-dependencies` to the `ONOS SNAPSHOT` version and the `trellis-api` version to the `trellis-control SNAPSHOT` version and push a patch
+3.3 Merge all the hotfixes in the branch created at the step `4.2` and push a new commit
+3.4 Write the branch name created at the step `4.2` in the `Makefile.vars.stable` file, alternatively the PR number using `pull/#PR/head`
-4. `fabric-tna`
+4. `up4`
4.1 Identify a stable commit that has been well tested and do reset to that commit
-4.2 Create a branch out of the stable commit; update the `onos-dependencies` to the `ONOS SNAPSHOT` version and the `trellis-api` version to the `trellis-control SNAPSHOT` version and push a patch
-4.3 Merge all the hotfixes in the branch created at the step `4.2` and push a new commit
-4.4 Write the branch name created at the step `4.2` in the `Makefile.vars.stable` file, alternatively the PR number using `pull/#PR/head`
+4.2 Create a branch out of the stable commit; update the `onos-dependencies` to the `ONOS SNAPSHOT` version and push a patch
+4.3 Merge all the hotfixes in the branch created at the step `5.2` and push a new commit
+4.4 Write the branch name created at the step `5.2` in the `Makefile.vars.stable` file, alternatively the PR number using `pull/#PR/head`
-5. `up4`
-5.1 Identify a stable commit that has been well tested and do reset to that commit
-5.2 Create a branch out of the stable commit; update the `onos-dependencies` to the `ONOS SNAPSHOT` version and push a patch
-5.3 Merge all the hotfixes in the branch created at the step `5.2` and push a new commit
-5.4 Write the branch name created at the step `5.2` in the `Makefile.vars.stable` file, alternatively the PR number using `pull/#PR/head`
-
-6. Build a stable image with the `docker-build` target using the locally built maven artifacts
+5. Build a stable image with the `docker-build` target using the locally built maven artifacts
`USE_LOCAL_SNAPSHOT_ARTIFACTS=true DOCKER_TAG=stable make docker-build`
## Update