Resolved merge conflicts

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

Author: rsarwad

.bazelrc

@@ -9,41 +9,46 @@ build:production --config=lsan --strip=never --copt=-O3
 
 # C/C++ CONFIGS
 build --cxxopt=-std=c++14
-build --experimental_strict_action_env
 build --compilation_mode=dbg
 
-# Default test configuration
+# DEFAULT TEST CONFIGURATION
+# Please read the GH issue #13073 before adding "test" options.
 test --test_output=errors
-test --flaky_test_attempts=5
+
+# Use dynamically linked folly library
+build --define=folly_so=1
 
 # MAGMA VM CONFIGS
 build:specify_vm_cc --action_env=CC=/usr/bin/gcc
-build:vm --disk_cache=/home/vagrant/magma/.bazel-cache
-common:vm --repository_cache=/home/vagrant/magma/.bazel-cache-repo
-build:vm --define=folly_so=1
 build:vm --config=specify_vm_cc
 
-# MAGMA-BUILDER DOCKER CONTAINER CONFIGS
-build:docker --define=folly_so=1
-
-# DEVCONTAINER CONFIGS
-build:devcontainer --disk_cache=/workspaces/magma/.bazel-cache
-common:devcontainer --repository_cache=/workspaces/magma/.bazel-cache-repo
-build:devcontainer --define=folly_so=1
+# DISK CACHE CONFIGS
+# The locations of the disk_cache/repository_cache are symlinks in the
+# docker containers/magma-vm. They point to the correct cache locations
+# $MAGMA/.bazel-cache and $MAGMA/.bazel-cache-repo inside the magma repository.
+build:disk_cache --disk_cache=/var/cache/bazel-cache
+common:disk_cache --repository_cache=/var/cache/bazel-cache-repo
 
 # REMOTE CACHING READ AND WRITE CONFIGS
 # The file bazel/bazelrcs/remote_caching_rw.bazelrc is templated in CI
-# The full config is then written to remote-cache.bazelrc
-build:remote_caching_rw --remote_download_toplevel
+# The full config is then written to bazel/bazelrcs/cache.bazelrc
+build:remote_caching_rw --remote_download_minimal
+# --remote_download_toplevel instead of --remote_download_minimal is
+# needed for 'bazel run' due to https://github.com/bazelbuild/bazel/issues/11920
+run:remote_caching_rw --remote_download_toplevel
 
 # REMOTE CACHING READ-ONLY CONFIGS
 # The file bazel/bazelrcs/remote_caching_ro.bazelrc is templated in CI
-# The full config is then written to remote-cache.bazelrc
-build:remote_caching_ro --remote_download_toplevel
+# The full config is then written to bazel/bazelrcs/cache.bazelrc
 build:remote_caching_ro --remote_upload_local_results=false 
+build:remote_caching_ro --remote_download_minimal
+# --remote_download_toplevel instead of --remote_download_minimal is
+# needed for 'bazel run' due to https://github.com/bazelbuild/bazel/issues/11920
+run:remote_caching_ro --remote_download_toplevel
 
-# Try importing the bazel remote caching config (relevant in CI)
-try-import remote-cache.bazelrc
+# Import the bazel caching config, with default disk cache,
+# which in CI gets overwritten by the remote caching config. 
+import bazel/bazelrcs/cache.bazelrc
 
 # TEST CONFIGS
 # Bazel test runtime default: PATH=/bin:/usr/bin:/usr/local/bin
@@ -52,10 +57,12 @@ build --test_env=PATH=/bin:/usr/bin:/usr/local/bin:/usr/sbin
 # Use MAGMA_ROOT from the host system in tests.
 # Needed by python tests (e.g. freedomfi_one_tests in enodebd)
 build --test_env=MAGMA_ROOT
+build --test_env=S1AP_TESTER_ROOT
 
 # MME specific compile time defines
 # Compile mme libraries with unit test flag
-test --per_file_copt=^lte/gateway/c/core/.*$@-DMME_UNIT_TEST
+test --per_file_copt=^lte/gateway/c/core/.*$@-DMME_UNIT_TEST  # See GH issue #13073
+build:mme_unit_test --per_file_copt=^lte/gateway/c/core/.*$@-DMME_UNIT_TEST  # See GH issue #13073
 # TODO: deprecate these flags used for logging if possible
 build --per_file_copt=^lte/gateway/c/core/.*$@-DPACKAGE_BUGREPORT=\"TBD\"
 build --per_file_copt=^lte/gateway/c/core/.*$@-DPACKAGE_VERSION=\"0.1\"

.devcontainer/Dockerfile

@@ -3,6 +3,7 @@
 ################################################################
 FROM ghcr.io/magma/magma/bazel-base:latest as devcontainer
 
+ARG HOME=/home/vscode
 # [Option] Install zsh
 ARG INSTALL_ZSH="true"
 # [Option] Upgrade OS packages to their latest versions
@@ -37,7 +38,6 @@ ENV MAGMA_ROOT=/workspaces/magma
 ENV BUILD_TYPE=Debug
 ENV C_BUILD=/workspaces/magma/build/c
 
-
 RUN echo "Install general purpose packages" && \
     apt-get update && \
     apt-get upgrade -y && \
@@ -77,12 +77,12 @@ RUN echo "Install general purpose packages" && \
 
 # Install golang 1.18
 WORKDIR /usr/local
-ARG GOLANG_VERSION="1.18"
+ARG GOLANG_VERSION="1.18.3"
 RUN GO_TARBALL="go${GOLANG_VERSION}.linux-amd64.tar.gz" \
  && curl https://artifactory.magmacore.org/artifactory/generic/${GO_TARBALL} --remote-name --location \
  && tar -xzf ${GO_TARBALL} \
  && rm ${GO_TARBALL}
-ENV PATH=$PATH:/usr/local/go/bin
+ENV PATH=${PATH}:/usr/local/go/bin:${HOME}/go/bin
 
 RUN echo "Install 3rd party dependencies" && \
     apt-get update && \
@@ -207,7 +207,7 @@ RUN ldconfig -v
 ##### Install Python requirements
 
 ### create virtualenv
-ARG PYTHON_VENV=/home/vscode/build/python
+ARG PYTHON_VENV=${HOME}/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
 
@@ -278,6 +278,4 @@ RUN for SWAGGER_SRC in lte orc8r; \
     rm -r ${PYTHON_VENV}/${GEN_DIR}/${SWAGGER_SRC}/swagger/test; \
     done
 
-RUN ln -fs $MAGMA_ROOT/bazel/bazelrcs/devcontainer.bazelrc /etc/bazelrc
-
 WORKDIR $MAGMA_ROOT

.devcontainer/bazel-base/Dockerfile

@@ -128,6 +128,7 @@ RUN wget --progress=dot:giga https://github.com/bazelbuild/bazelisk/releases/dow
 # Update shared library configuration
 RUN ldconfig -v
 
-RUN ln -s /workspaces/magma/bazel/bazelrcs/docker.bazelrc /etc/bazelrc
+RUN ln -s /workspaces/magma/.bazel-cache /var/cache/bazel-cache
+RUN ln -s /workspaces/magma/.bazel-cache-repo /var/cache/bazel-cache-repo
 
 WORKDIR /workspaces/magma

.devcontainer/bazel-base/bazelrcs/devcontainer.bazelrc

@@ -9,15 +9,12 @@ echo "alias magtivate='source /home/vscode/build/python/bin/activate'" >> ~/.bas
 # Locally opened Devcontainer has access to persistent cache directory in .bazel-cache and .bazel-cache-repo.
 # This is a little hacky, but GITHUB_CODESPACE_TOKEN should only be defined for the Codespace case
 if [[ -z $GITHUB_CODESPACE_TOKEN ]]; then
-    echo "Assuming the devcontainer is opened locally, not pulling in Bazel cache..."
+    echo "Assuming the devcontainer is opened locally, not using Bazel remote cache..."
 else
-    echo "Assuming the devcontainer is opened in GitHub Codespaces, pulling in Bazel cache..."
-    # Pull in cache to speed up Bazel build. The cache is populated by a GitHub Action job periodically (.github/workflows/bazel-cache-push.yml)
-    # Fetch repository cache
-    wget -qO- https://magma-cache.s3.amazonaws.com/bazel-cache-repo-devcontainer.tar.gz | tar xvfz -
-    # Fetch build cache
-    wget -qO- https://magma-cache.s3.amazonaws.com/bazel-cache-devcontainer.tar.gz | tar xvfz -
+    echo "Assuming the devcontainer is opened in GitHub Codespaces, using read-only Bazel remote cache..."
+    cache_key=bazel-base-image  #  the devcontainer is based on the bazel-base container
+    (cd "$1" && bazel/scripts/remote_cache_bazelrc_setup.sh $cache_key)
 fi
 
 echo "Generating compile_commands.json for C/C++ code navigation"
-"$1"/dev_tools/gen_compilation_database.py
+"$1"/dev_tools/gen_compilation_database.py

.devcontainer/bazel-base/bazelrcs/docker.bazelrc

@@ -57,6 +57,8 @@
 !dp/protos/
 !dp/Makefile
 
+!build/gen
+
 !protos/
 
 !xwf/gateway/

.devcontainer/bazel-base/bazelrcs/vm.bazelrc

@@ -3,9 +3,9 @@
 # GitHub-specific: https://github.com/github/linguist/blob/master/docs/overrides.md
 
 # Monolithic swagger.yml is generated
-/orc8r/cloud/go/obsidian/swagger/v1/swagger.yml linguist-generated
+/orc8r/cloud/go/services/obsidian/swagger/v1/swagger.yml linguist-generated
 # NMS bindings are generated
-/nms/generated/MagmaAPIBindings.js linguist-generated
+/nms/generated/** linguist-generated
 # SBI openapi interface generated files
 /feg/gateway/sbi/specs/** linguist-generated
 # requirements.txt for bazel builds is generated from requirements.in

.devcontainer/post-create-commands.sh

@@ -1,5 +1,5 @@
 ---
-name: "\U0001F41E  Bug report"
+name: "\U0001F41E Bug report"
 about: Report a bug or known issue
 title: ''
 labels: 'type: bug'
@@ -20,17 +20,21 @@ Prior to submitting an issue, check to see if one has already been created. If t
 
 A clear and concise description of what the bug is.
 
-**To Reproduce**
+#### To Reproduce
+
 1. Go to '...'
 2. Click on '....'
 3. Scroll down to '....'
 4. See error
 
-**Expected behavior**
+#### Expected behavior
+
 A clear and concise description of what you expected to happen.
 
-**Screenshots**
+#### Screenshots
+
 If applicable, add screenshots to help explain your problem.
 
-**Additional context**
+#### Additional context
+
 Add any other context about the problem here (e.g. logs).