From 544e92a28462931ac0188ce515d67cd03b20e1f9 Mon Sep 17 00:00:00 2001
From: Mats Rynge <mats@rynge.net>
Date: Tue, 21 Feb 2023 10:57:17 -0800
Subject: [PATCH] SOFTWARE-5299: OSG_PROJECT_NAME configuration for Docker
 pilots

---
 docs/resource-sharing/os-backfill-containers.md | 9 ++++-----
 docs/resource-sharing/user-containers.md        | 9 +++++----
 2 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/docs/resource-sharing/os-backfill-containers.md b/docs/resource-sharing/os-backfill-containers.md
index 077a9a6e5..b7cf07d05 100644
--- a/docs/resource-sharing/os-backfill-containers.md
+++ b/docs/resource-sharing/os-backfill-containers.md
@@ -60,9 +60,10 @@ In order to successfully start payload jobs:
     Replace `/worker-temp-dir` with a directory you created for jobs to write into.
     Make sure the user you run your container as has write access to this directory.
 
-6. _Optional:_ add an expression with the `GLIDEIN_Start_Extra` environment variable to append to the
-   [HTCondor `START` expression](https://htcondor.readthedocs.io/en/latest/admin-manual/policy-configuration.html#the-start-expression);
-   this limits the pilot to only run certain jobs.
+6. _Optional:_ specify a project with the `OSG_PROJECT_NAME` environment variable to limit
+    the pilot to only run jobs from a certain project. Example:
+    `-e OSG_PROJECT_NAME="my-project"`. Note that the previous setting
+    `GLIDEIN_Start_Extra` is now deprecated and will be removed in the future.
 
 7. _Optional:_ [limit OSG pilot container resource usage](#limiting-resource-usage)
 
@@ -77,7 +78,6 @@ docker run -it --rm --user osg  \
        -v /worker-temp-dir:/pilot               \
        -e GLIDEIN_Site="..."                    \
        -e GLIDEIN_ResourceName="..."            \
-       -e GLIDEIN_Start_Extra="True"            \
        -e OSG_SQUID_LOCATION="..."              \
        -e CVMFSEXEC_REPOS="                     \
             oasis.opensciencegrid.org           \
@@ -160,7 +160,6 @@ docker run -it --rm --user osg      \
         -v /worker-temp-dir:/pilot      \
         -e GLIDEIN_Site="..."           \
         -e GLIDEIN_ResourceName="..."   \
-        -e GLIDEIN_Start_Extra="True"   \
         -e OSG_SQUID_LOCATION="..."     \
         opensciencegrid/osgvo-docker-pilot:3.6-release
 ```
diff --git a/docs/resource-sharing/user-containers.md b/docs/resource-sharing/user-containers.md
index 672cb438e..200040739 100644
--- a/docs/resource-sharing/user-containers.md
+++ b/docs/resource-sharing/user-containers.md
@@ -41,10 +41,11 @@ export TOKEN="put_your_provided_token_here"
 export GLIDEIN_Site="SDSC"
 export GLIDEIN_ResourceName="Comet"
 
-# This is an important setting limiting what jobs your glideins will accept.
-# At the minimum, the expression should limit the "Owner" of the jobs to
-# whatever your username is on the OSG _submit_ side
-export GLIDEIN_Start_Extra="Owner == \"my_osgconnect_username\""
+# You may limit pilots to only run jobs from a specific project. For
+# example, if the pilot runs on hardware which is dedicated and policy
+# states that only project jobs may use that hardward. The default is
+# to run any job in the OSPool.
+# export OSG_PROJECT_NAME="my-project"
 
 module load singularity
 singularity run --contain \