test

DataDog · Jan 5, 2024 · b4ee9b4 · b4ee9b4
1 parent 5e9ea00
commit b4ee9b4
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 4 deletions.
diff --git a/.github/workflows/publish-community-operators-base.yml b/.github/workflows/publish-community-operators-base.yml
@@ -12,6 +12,9 @@ on:
       repo:
         type: string
         required: true
+      dir:
+        type: string
+        required: false
     secrets:
       GH_ROBOT_TOKEN:
         required: true
@@ -31,15 +34,12 @@ jobs:
           echo "TARGET_GH_ORG=${{ inputs.org }}" >> $GITHUB_ENV
           echo "TARGET_GH_REPO=${{ inputs.repo }}" >> $GITHUB_ENV
           echo "BUNDLE_PATH=tmp/bundle" >> $GITHUB_ENV
-          echo "OPERATOR_DIR=datadog-operator" >> $GITHUB_ENV
           
           if [[ "${{ !inputs.community_repo }}" ]]; then
             if [[ "${{ inputs.repo }}" == "redhat-marketplace-operators" ]]; then
               echo "BUNDLE_PATH=tmp/bundle-redhat-mp" >> $GITHUB_ENV
-              echo "OPERATOR_DIR=datadog-operator-certified-rhmp" >> $GITHUB_ENV
             elif [[ "${{ inputs.repo }}" == "certified-operators" ]]; then
               echo "BUNDLE_PATH=tmp/bundle-redhat" >> $GITHUB_ENV
-              echo "OPERATOR_DIR=datadog-operator-certified" >> $GITHUB_ENV
             fi 
             echo "${{ secrets.REDHAT_TOKEN }} >> ~/.redhat/auths.json"
             sudo apt-get -y update
@@ -81,7 +81,7 @@ jobs:
         working-directory: ${{ inputs.repo }}
         run: |
           mkdir operators/$OPERATOR_DIR/$VERSION
-          cp -R ./$BUNDLE_PATH/* operators/$OPERATOR_DIR/$VERSION
+          cp -R ./$BUNDLE_PATH/* operators/${{ inputs.dir }}/$VERSION
           rm -rf ./tmp
 
       - name: Configure git user

diff --git a/.github/workflows/publish-community-operators.yml b/.github/workflows/publish-community-operators.yml
@@ -11,6 +11,7 @@ jobs:
       community_repo: true
       org: k8s-operatorhub
       repo: community-operators
+      dir: datadog-operator
     secrets:
       GH_ROBOT_TOKEN: ${{secrets.GH_ROBOT_TOKEN}}
 
@@ -33,6 +34,7 @@ jobs:
       community_repo: false
       org: redhat-openshift-ecosystem
       repo: redhat-marketplace-operators
+      dir: datadog-operator-certified-rhmp
     secrets:
       GH_ROBOT_TOKEN: ${{secrets.GH_ROBOT_TOKEN}}
 
@@ -44,5 +46,6 @@ jobs:
       community_repo: false
       org: redhat-openshift-ecosystem
       repo: certified-operators
+      dir: datadog-operator-certified
     secrets:
       GH_ROBOT_TOKEN: ${{secrets.GH_ROBOT_TOKEN}}