Address comments and made appropriate changes.

stackhpc · Feb 7, 2024 · f9c6c98 · f9c6c98
1 parent 352be74
commit f9c6c98
Show file tree

Hide file tree

Showing 8 changed files with 2 additions and 42 deletions.
diff --git a/.github/workflows/container-promote-old.yml b/.github/workflows/container-promote-old.yml
@@ -24,10 +24,6 @@ on:
         description: Whether to promote images for Zed and newer
         type: boolean
         default: true
-      skip_pulp:
-        description: Whether to skip pulp promotion
-        type: boolean
-        default: true
 
 env:
   ANSIBLE_FORCE_COLOR: True
@@ -55,7 +51,6 @@ jobs:
         -e kolla_base_distros_override="'$DISTROS'" \
         -e sync_old_images="'$PROMOTE_OLD_IMAGES'" \
         -e sync_new_images="'$PROMOTE_NEW_IMAGES'"
-      if: inputs.filter.skip_pulp == false
       env:
         TAG: ${{ github.event.inputs.tag }}
         FILTER: ${{ github.event.inputs.filter }}

diff --git a/.github/workflows/container-promote.yml b/.github/workflows/container-promote.yml
@@ -16,11 +16,6 @@ on:
         type: boolean
         required: false
         default: false
-      skip_pulp:
-        description: Whether to skip pulp promotion
-        type: boolean
-        default: true
-
 
 env:
   ANSIBLE_FORCE_COLOR: True
@@ -58,7 +53,6 @@ jobs:
         -e kolla_container_image_filter="'$FILTER'" \
         -e kayobe_config_repo_path=./stackhpc-kayobe-config/ \
         $args
-      if: inputs.filter.skip_pulp == false
       env:
         FILTER: ${{ github.event.inputs.filter }}
         CHECK_MODE: ${{ inputs.check_mode }}
diff --git a/.github/workflows/container-publish.yml b/.github/workflows/container-publish.yml
@@ -20,11 +20,6 @@ on:
         type: string
         required: false
         default: ""
-      skip_pulp:
-        description: Whether to skip pulp promotion
-        type: boolean
-        default: true
-
 
 env:
   ANSIBLE_FORCE_COLOR: True
@@ -48,7 +43,6 @@ jobs:
         ansible/dev-pulp-container-publish.yml \
         -e kolla_container_image_filter="'$FILTER'" \
         -e kolla_base_distros_override="'$DISTROS'"
-      if: inputs.skip_pulp == false
       env:
         FILTER: ${{ github.event.inputs.filter }}
         DISTROS: ${{ github.event.inputs.distros }}
diff --git a/.github/workflows/container-sync.yml b/.github/workflows/container-sync.yml
@@ -22,7 +22,7 @@ on:
         type: boolean
         default: true
       skip_pulp:
-        description: Whether to skip pulp promotion
+        description: Whether to skip test pulp promotion
         type: boolean
         default: true
 
@@ -52,7 +52,6 @@ jobs:
         -e kolla_base_distros_override="'$DISTROS'" \
         -e sync_old_images="'$SYNC_OLD_IMAGES'" \
         -e sync_new_images="'$SYNC_NEW_IMAGES'"
-      if: inputs.filter.skip_pulp == false
       env:
         FILTER: ${{ github.event.inputs.filter }}
         DISTROS: ${{ github.event.inputs.distros }}
@@ -67,7 +66,6 @@ jobs:
         -e kolla_base_distros_override="'$DISTROS'" \
         -e sync_old_images="'$SYNC_OLD_IMAGES'" \
         -e sync_new_images="'$SYNC_NEW_IMAGES'"
-      if: inputs.filter.skip_pulp == false
       env:
         FILTER: ${{ github.event.inputs.filter }}
         DISTROS: ${{ github.event.inputs.distros }}

diff --git a/.github/workflows/package-promote.yml b/.github/workflows/package-promote.yml
@@ -17,10 +17,6 @@ on:
         type: boolean
         required: false
         default: false
-      skip_pulp:
-        description: Whether to skip pulp promotion
-        type: boolean
-        default: true
 
 env:
   ANSIBLE_FORCE_COLOR: True
@@ -59,7 +55,6 @@ jobs:
         -e rpm_package_repo_filter="'$FILTER'" \
         -e kayobe_config_repo_path=./stackhpc-kayobe-config/ \
         $args
-      if: inputs.filter.skip_pulp == false
       env:
         FILTER: ${{ github.event.inputs.filter }}
         CHECK_MODE: ${{ inputs.check_mode }}
diff --git a/.github/workflows/package-sync-version-test-pulp.yml b/.github/workflows/package-sync-version-test-pulp.yml
@@ -13,11 +13,6 @@ on:
         type: string
         required: false
         default: ""
-      skip_pulp:
-        description: Whether to skip pulp promotion
-        type: boolean
-        default: true
-
 
 env:
   ANSIBLE_FORCE_COLOR: True
@@ -47,7 +42,6 @@ jobs:
         -e test_pulp_sync_repo_version="'$REPO_VERSION'" \
         -e deb_package_repo_filter="'$FILTER'" \
         -e rpm_package_repo_filter="'$FILTER'"
-      if: inputs.skip_pulp == false
       env:
         FILTER: ${{ github.event.inputs.filter }}
         REPO_VERSION: ${{ github.event.inputs.repo_version }}
diff --git a/.github/workflows/package-sync.yml b/.github/workflows/package-sync.yml
@@ -32,10 +32,6 @@ on:
         type: string
         required: false
         default: ""
-      skip_pulp:
-        description: Whether to skip pulp promotion
-        type: boolean
-        default: true
 
 env:
   ANSIBLE_FORCE_COLOR: True
@@ -64,7 +60,6 @@ jobs:
         ansible/dev-pulp-repo-publish.yml \
         -e deb_package_repo_filter="'$FILTER'" \
         -e rpm_package_repo_filter="'$FILTER'"
-      if: inputs.skip_pulp == false
       env:
         FILTER: ${{ inputs.filter }}
 
@@ -92,6 +87,6 @@ jobs:
         ansible/test-pulp-repo-publish.yml \
         -e deb_package_repo_filter="'$FILTER'" \
         -e rpm_package_repo_filter="'$FILTER'"
-      if: inputs.skip_pulp == false
+      if: inputs.sync_test == false
       env:
         FILTER: ${{ inputs.filter }}
diff --git a/.github/workflows/package-update-kayobe.yml b/.github/workflows/package-update-kayobe.yml
@@ -12,10 +12,6 @@ on:
         required: false
         description: Branch of StackHPC Kayobe configuration to use
         default: stackhpc/wallaby
-      skip_pulp:
-        description: Whether to skip pulp promotion
-        type: boolean
-        default: true
 
 env:
   ANSIBLE_FORCE_COLOR: True
@@ -49,7 +45,6 @@ jobs:
           -e deb_package_repo_filter="'$FILTER'" \
           -e rpm_package_repo_filter="'$FILTER'" \
           -e kayobe_config_repo_path=./stackhpc-kayobe-config/
-        if: inputs.skip_pulp == false
         env:
           FILTER: ${{ github.event.inputs.filter }}