Merge remote-tracking branch 'upstream/master' into 11190_spgw_ue_context_ht

Signed-off-by: Rashmi <[email protected]>

Author: rsarwad

.bazelrc

@@ -65,7 +65,7 @@ build --test_env=MAGMA_ROOT
 build --test_env=S1AP_TESTER_ROOT
 
 # Needed for go tests to generate the test result XML in the correct format  
-test --test_env=GO_TEST_WRAP_TESTV=1
+build --test_env=GO_TEST_WRAP_TESTV=1
 
 # MME specific compile time defines
 # Compile mme libraries with unit test flag

.devcontainer/Dockerfile

@@ -60,6 +60,7 @@ RUN echo "Install general purpose packages" && \
         perl \
         pkg-config \
         python3-pip \
+        python3-venv \
         redis-server \
         ruby \
         rubygems \
@@ -207,74 +208,4 @@ RUN GOBIN="/usr/bin/" go install -v golang.org/x/tools/[email protected] && \
 #### Update shared library configuration
 RUN ldconfig -v
 
-
-##### Install Python requirements
-
-### create virtualenv
-ARG PYTHON_VENV=/home/vscode/build/python
-ENV PYTHON_VENV_EXECUTABLE=${PYTHON_VENV}/bin/python${PYTHON_VERSION}
-# PYTHON_VENV must by in sync with "python.defaultInterpreterPath", "python.analysis.extraPaths" and magtivate path in "postCreateCommand" in .devcontainer/devcontainer.json
-
-RUN virtualenv --system-site-packages --python=/usr/bin/python${PYTHON_VERSION} ${PYTHON_VENV}
-RUN ${PYTHON_VENV_EXECUTABLE} -m pip install --quiet --upgrade --no-cache-dir "setuptools==49.6.0"
-
-### install eggs (lte, orc8r)
-COPY /lte/gateway/python/ ${MAGMA_ROOT}/lte/gateway/python/
-WORKDIR ${MAGMA_ROOT}/lte/gateway/python/
-RUN ${PYTHON_VENV_EXECUTABLE} -m pip install --quiet --upgrade --no-build-isolation --no-cache-dir --verbose --editable .[dev] && \
-    rm -rf lte.egg-info
-
-COPY /orc8r/gateway/python/ ${MAGMA_ROOT}/orc8r/gateway/python/
-WORKDIR ${MAGMA_ROOT}/orc8r/gateway/python/
-RUN ${PYTHON_VENV_EXECUTABLE} -m pip install --quiet --upgrade --no-build-isolation --no-cache-dir --verbose --editable .[dev] && \
-    rm -rf orc8r.egg-info
-
-### install formatter autopep8
-RUN ${PYTHON_VENV_EXECUTABLE} -m pip install --no-cache-dir autopep8
-
-#### protos
-ARG GEN_DIR=lib/python${PYTHON_VERSION}/gen
-
-COPY /protos/ ${MAGMA_ROOT}/protos/
-COPY /lte/protos/ ${MAGMA_ROOT}/lte/protos/
-COPY /orc8r/protos/ ${MAGMA_ROOT}/orc8r/protos/
-COPY /feg/protos/ ${MAGMA_ROOT}/feg/protos/
-COPY /dp/protos/ ${MAGMA_ROOT}/dp/protos/
-WORKDIR ${MAGMA_ROOT}
-RUN ${PYTHON_VENV_EXECUTABLE} -m pip install --no-cache-dir "mypy-protobuf==2.4" && \
-    mkdir ${PYTHON_VENV}/${GEN_DIR} && \
-    for PROTO_SRC in orc8r lte feg dp; \
-    do \
-    ${PYTHON_VENV_EXECUTABLE} protos/gen_protos.py ${PROTO_SRC}/protos ${MAGMA_ROOT},orc8r/protos/prometheus ${MAGMA_ROOT} ${PYTHON_VENV}/${GEN_DIR} && \
-    ${PYTHON_VENV_EXECUTABLE} protos/gen_prometheus_proto.py ${MAGMA_ROOT} ${PYTHON_VENV}/${GEN_DIR}; \
-    done && \
-    echo "${PYTHON_VENV}/${GEN_DIR}" > ${PYTHON_VENV}/lib/python${PYTHON_VERSION}/site-packages/magma_gen.pth
-
-### swagger
-ENV SWAGGER_CODEGEN_DIR=/var/tmp/codegen
-ENV SWAGGER_CODEGEN_JAR=${SWAGGER_CODEGEN_DIR}/swagger-codegen-cli.jar
-ARG CODEGEN_VERSION=2.2.3
-
-RUN mkdir -p ${SWAGGER_CODEGEN_DIR}; \
-    wget --no-verbose https://repo1.maven.org/maven2/io/swagger/swagger-codegen-cli/${CODEGEN_VERSION}/swagger-codegen-cli-${CODEGEN_VERSION}.jar -O ${SWAGGER_CODEGEN_JAR}
-
-# Copy swagger specs over to the build directory,
-# so that eventd can access them at runtime
-COPY lte/swagger/*.yml ${PYTHON_VENV}/${GEN_DIR}/lte/swagger/specs/
-COPY orc8r/swagger/*.yml ${PYTHON_VENV}/${GEN_DIR}/orc8r/swagger/specs/
-RUN for SWAGGER_SRC in lte orc8r; \
-    do \
-    # Generate the files
-    ls ${PYTHON_VENV}/${GEN_DIR}/${SWAGGER_SRC}/swagger/specs/*.yml \
-    | xargs -t -I% /usr/bin/java -jar ${SWAGGER_CODEGEN_JAR} generate \
-    -i % \
-    -o ${PYTHON_VENV}/${GEN_DIR}/${SWAGGER_SRC}/swagger \
-    -l python \
-    -D models && \
-    # Flatten and clean up directory
-    mv ${PYTHON_VENV}/${GEN_DIR}/${SWAGGER_SRC}/swagger/swagger_client/* ${PYTHON_VENV}/${GEN_DIR}/${SWAGGER_SRC}/swagger/ && \
-    rmdir ${PYTHON_VENV}/${GEN_DIR}/${SWAGGER_SRC}/swagger/swagger_client && \
-    rm -r ${PYTHON_VENV}/${GEN_DIR}/${SWAGGER_SRC}/swagger/test; \
-    done
-
 WORKDIR $MAGMA_ROOT

.devcontainer/devcontainer.json

@@ -82,10 +82,9 @@
 		"python.terminal.activateEnvironment": true,
 		"python.analysis.extraPaths": [
 			"${containerWorkspaceFolder}/orc8r/gateway/python/",
-			"${containerWorkspaceFolder}/lte/gateway/python/",
-			"/home/vscode/build/python/lib/python3.8/site-packages" // has to be in sync with $PYTHON_VENV and $PYTHON_VERSION from .devcontainer/Dockerfile
+			"${containerWorkspaceFolder}/lte/gateway/python/"
 		],
-		"python.defaultInterpreterPath": "/home/vscode/build/python/bin/python3.8", // has to be in sync with $PYTHON_VENV and $PYTHON_VERSION from .devcontainer/Dockerfile
+		"python.defaultInterpreterPath": "/home/vscode/python_ide_env/bin/python3",
 		"python.formatting.provider": "autopep8",
 		"python.formatting.autopep8Args": [
 			// This should be the same set of flags as ones specified in `lte/gateway/precommit.py`

.github/workflows/agw-coverage.yml

@@ -103,7 +103,7 @@ jobs:
           github.repository_owner == 'magma' &&
           github.ref_name == 'master'
         with:
-          name: Bazel test C/C++ coverage profile
+          name: Bazel test C and C++ coverage profile
           path: Bazel_test_cc_coverage_profile
       - name: Build space left after run
         shell: bash
@@ -118,7 +118,7 @@ jobs:
           github.event_name == 'push'
         uses: rtCamp/action-slack-notify@12e36fc18b0689399306c2e0b3e0f2978b7f1ee7 # [email protected]
         env:
-          SLACK_WEBHOOK: ${{ secrets.SLACK_WEBHOOK_BAZEL_CI }}
+          SLACK_WEBHOOK: ${{ secrets.SLACK_WEBHOOK }}
           SLACK_TITLE: "C / C++ code coverage with Bazel"
           SLACK_USERNAME: "${{ github.workflow }}"
           SLACK_ICON_EMOJI: ":boom:"
@@ -189,7 +189,7 @@ jobs:
           github.event_name == 'push'
         uses: rtCamp/action-slack-notify@12e36fc18b0689399306c2e0b3e0f2978b7f1ee7 # [email protected]
         env:
-          SLACK_WEBHOOK: ${{ secrets.SLACK_WEBHOOK_BAZEL_CI }}
+          SLACK_WEBHOOK: ${{ secrets.SLACK_WEBHOOK }}
           SLACK_TITLE: "Python code coverage with Bazel"
           SLACK_USERNAME: "${{ github.workflow }}"
           SLACK_ICON_EMOJI: ":boom:"

.github/workflows/agw-docker-load-test.yml

@@ -9,7 +9,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-name: AGW docker load test
+name: AGW Test Load Docker AMI
 
 on:
   workflow_run:

.github/workflows/agw-workflow.yml

@@ -9,7 +9,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-name: agw-workflow
+name: AGW Lint & Test
 
 on:
   push:
@@ -28,10 +28,6 @@ concurrency:
 
 env:
   DEVCONTAINER_IMAGE: "ghcr.io/magma/magma/devcontainer:latest"
-  BAZEL_BASE_IMAGE: "ghcr.io/magma/magma/bazel-base:latest"
-  # see GH14041
-  CACHE_KEY: bazel-base-image-sha-c4de1e5
-  REMOTE_DOWNLOAD_OPTIMIZATION: true
 
 jobs:
   path_filter:

.github/workflows/autolabel-pullrequests.yml

@@ -9,7 +9,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-name: AutoLabel PR
+name: PR Generate Labels
 on:
   # Use pull_request_target to gain write permissions.
   # Ref: https://github.blog/2020-08-03-github-actions-improvements-for-fork-and-pull-request-workflows/

.github/workflows/backport-pull-request.yml

@@ -11,7 +11,7 @@
 
 # Based on https://github.com/sqren/backport-github-action/blob/main/README.md under MIT license.
 
-name: backport-pull-request
+name: PR Backport
 on:
   pull_request_target:
     types:

.github/workflows/bazel.yml

@@ -9,7 +9,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-name: "Bazel Build & Test"
+name: AGW Build, Format & Test Bazel
 on:
   # yamllint disable-line rule:truthy
   workflow_dispatch:
@@ -123,8 +123,8 @@ jobs:
             printf '\r%s\r' '###############################' 1>&2
             bazel build \
               ${{ matrix.bazel-target }} \
-              ${{ matrix.bazel-config }} \
               --config=mme_unit_test \
+              ${{ matrix.bazel-config }} \
               --profile=Bazel_build_all_profile
 
             printf '\r%s\r' '###############################' 1>&2
@@ -207,7 +207,7 @@ jobs:
         if: failure() && github.event_name == 'push' && github.repository_owner == 'magma'
         uses: rtCamp/action-slack-notify@12e36fc18b0689399306c2e0b3e0f2978b7f1ee7 # [email protected]
         env:
-          SLACK_WEBHOOK: ${{ secrets.SLACK_WEBHOOK_BAZEL_CI }}
+          SLACK_WEBHOOK: ${{ secrets.SLACK_WEBHOOK }}
           SLACK_TITLE: "Bazel Build & Test Job `bazel build //...; bazel test //...` ${{ matrix.bazel-config }}"
           SLACK_USERNAME: "Bazel Build & Test"
           SLACK_ICON_EMOJI: ":boom:"
@@ -227,7 +227,7 @@ jobs:
       success: ${{ steps.setoutput.outputs.success }}
     steps:
       - id: setoutput
-        run: echo "::set-output name=success::true"
+        run: echo "success=true" >> $GITHUB_OUTPUT
 
   report_result_bazel_build_and_test:
     name: Bazel build and test status
@@ -309,7 +309,7 @@ jobs:
         if: failure() && github.event_name == 'push' && github.repository_owner == 'magma'
         uses: rtCamp/action-slack-notify@12e36fc18b0689399306c2e0b3e0f2978b7f1ee7 # [email protected]
         env:
-          SLACK_WEBHOOK: ${{ secrets.SLACK_WEBHOOK_BAZEL_CI }}
+          SLACK_WEBHOOK: ${{ secrets.SLACK_WEBHOOK }}
           SLACK_TITLE: "Bazel Package Job"
           SLACK_USERNAME: "Bazel Build & Test"
           SLACK_ICON_EMOJI: ":boom:"
@@ -331,7 +331,7 @@ jobs:
         if: failure() && github.event_name == 'push' && github.repository_owner == 'magma'
         uses: rtCamp/action-slack-notify@12e36fc18b0689399306c2e0b3e0f2978b7f1ee7 # [email protected]
         env:
-          SLACK_WEBHOOK: ${{ secrets.SLACK_WEBHOOK_BAZEL_CI }}
+          SLACK_WEBHOOK: ${{ secrets.SLACK_WEBHOOK }}
           SLACK_TITLE: "Bazel Python Check Job `./bazel/scripts/check_py_bazel.sh`"
           SLACK_USERNAME: "Bazel Build & Test"
           SLACK_ICON_EMOJI: ":boom:"
@@ -353,7 +353,7 @@ jobs:
         if: failure() && github.event_name == 'push' && github.repository_owner == 'magma'
         uses: rtCamp/action-slack-notify@12e36fc18b0689399306c2e0b3e0f2978b7f1ee7 # [email protected]
         env:
-          SLACK_WEBHOOK: ${{ secrets.SLACK_WEBHOOK_BAZEL_CI }}
+          SLACK_WEBHOOK: ${{ secrets.SLACK_WEBHOOK }}
           SLACK_TITLE: "Bazel C/C++ Check Job `./bazel/scripts/check_c_cpp_bazel.sh`"
           SLACK_USERNAME: "Bazel Build & Test"
           SLACK_ICON_EMOJI: ":boom:"

.github/workflows/build_all.yml

@@ -9,7 +9,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-name: build-all
+name: Magma Build & Publish
 
 on:
   workflow_dispatch: null