Add CV Auto Publish testing to BATS suite (#1930)

Author: jturel

bats/fb-katello-content.bats

@@ -111,6 +111,16 @@ setup() {
     --name="${CONTENT_VIEW}" --repository-id="$repo_id" | grep -q "The repository has been associated"
 }
 
+@test "create auto publish composite content view" {
+  hammer content-view create --organization="${ORGANIZATION}" \
+    --name="${AUTO_PUBLISH_COMPOSITE_VIEW}" --auto-publish=true --composite
+}
+
+@test "add first component to auto publish composite" {
+  hammer content-view component add --organization="${ORGANIZATION}" \
+    --latest --component-content-view="${CONTENT_VIEW}" --composite-content-view="${AUTO_PUBLISH_COMPOSITE_VIEW}"
+}
+
 @test "publish content view" {
   hammer content-view publish --organization="${ORGANIZATION}" \
     --name="${CONTENT_VIEW}"
@@ -317,16 +327,21 @@ setup() {
     --content-view="${CONTENT_VIEW_2}" --content-view-filter="${FILTER3}" --module-stream-ids=$modulemd_id
 }
 
+@test "add second component to auto publish composite" {
+  hammer content-view component add --organization="${ORGANIZATION}" \
+    --latest --component-content-view="${CONTENT_VIEW_2}" --composite-content-view="${AUTO_PUBLISH_COMPOSITE_VIEW}"
+}
+
 @test "publish first component content view" {
   hammer content-view publish --organization="${ORGANIZATION}" \
     --name="${CONTENT_VIEW_2}"
 }
 
 @test "create composite content view" {
   cv_id1=$(hammer --csv --no-headers content-view version list --organization="${ORGANIZATION}" \
-    | grep "${CONTENT_VIEW_2} 1.0" | cut -d, -f1)
+    --content-view="${CONTENT_VIEW_2}" --fields=id --per-page=1)
   cv_id2=$(hammer --csv --no-headers content-view version list --organization="${ORGANIZATION}" \
-    | grep "${CONTENT_VIEW} 2.0" | cut -d, -f1)
+    --content-view="${CONTENT_VIEW}" --fields=id --per-page=1 --page=2)
   hammer content-view create --organization="${ORGANIZATION}" \
     --name="${CONTENT_VIEW_3}" --composite --component-ids=$cv_id1,$cv_id2
 }
@@ -340,23 +355,23 @@ setup() {
 
 @test "incremental update first component cv with composite propagation" {
   cvv_id=$(hammer --csv --no-headers content-view version list --organization="${ORGANIZATION}" \
-    | grep "${CONTENT_VIEW_2}" | cut -d, -f1)
+    --content-view="${CONTENT_VIEW_2}" --fields=id --per-page=1)
   hammer content-view version incremental-update --organization="${ORGANIZATION}" \
     --content-view-version-id=$cvv_id --errata-ids=RHEA-2012:0055 --propagate-all-composites=true \
     --lifecycle-environments="Library"
 }
 
 @test "ensure component cv 1 version 1.1 has proper environments" {
   cvv_id=$(hammer --csv --no-headers content-view version list --organization="${ORGANIZATION}" \
-    | grep "${CONTENT_VIEW_2} 1.1" | cut -d, -f1)
+    --content-view="${CONTENT_VIEW_2}" --fields=id --per-page=1)
   envs_found=$(hammer content-view version info --organization="${ORGANIZATION}" \
     --id=$cvv_id | awk '/Lifecycle Environments/{flag=1;next}/Repositories/{flag=0}flag' | grep "Name:")
   echo $envs_found | grep -q -E "Name:\s+Library"
 }
 
 @test "ensure composite cv version 1.1 has proper environments" {
   cvv_id=$(hammer --csv --no-headers content-view version list --organization="${ORGANIZATION}" \
-    | grep "${CONTENT_VIEW_3} 1.1" | cut -d, -f1)
+    --content-view="${CONTENT_VIEW_3}" --fields=id --per-page=1)
   envs_found=$(hammer content-view version info --organization="${ORGANIZATION}" \
     --id=$cvv_id | awk '/Lifecycle Environments/{flag=1;next}/Repositories/{flag=0}flag' | grep "Name:")
   echo $envs_found | grep -q -E "Name:\s+Library"
@@ -365,7 +380,7 @@ setup() {
 
 @test "ensure component cv 1 latest version has proper content" {
   cvv_id=$(hammer --csv --no-headers content-view version list --organization="${ORGANIZATION}" \
-    | grep "${CONTENT_VIEW_2} 1.1" | cut -d, -f1)
+    --content-view="${CONTENT_VIEW_2}" --fields=id --per-page=1)
   hammer package list --content-view-version-id=$cvv_id --order='name DESC' --fields='filename' > cvv_content_rpms
   diff cvv_content_rpms fixtures/component_1_rpms
 
@@ -386,7 +401,7 @@ setup() {
 
 @test "ensure component cv 2 latest version has proper content" {
   cvv_id=$(hammer --csv --no-headers content-view version list --organization="${ORGANIZATION}" \
-    | grep "${CONTENT_VIEW} 2.0" | cut -d, -f1)
+    --content-view="${CONTENT_VIEW}" --fields=id --per-page=1)
   hammer package list --content-view-version-id=$cvv_id --order='name DESC' --fields='filename' > cvv_content_rpms_2
   diff cvv_content_rpms_2 fixtures/component_2_rpms
 
@@ -407,7 +422,7 @@ setup() {
 
 @test "ensure composite cv latest version has proper content" {
   cvv_id=$(hammer --csv --no-headers content-view version list --organization="${ORGANIZATION}" \
-    | grep "${CONTENT_VIEW_3} 1.1" | cut -d, -f1)
+    --content-view="${CONTENT_VIEW_3}" --fields=id --per-page=1)
 
   # Sorting and removing duplicates due to Pulp2/Pulp3 differences (https://projects.theforeman.org/issues/30755)
   hammer package list --content-view-version-id=$cvv_id --order='name DESC' --fields='filename' \
@@ -429,6 +444,13 @@ setup() {
     --order='tag' | grep 'sha256:13280b5914050853a87d662c3229d42b61544e36dd4515f06e188835f3407468'
 }
 
+@test "ensure auto publish composite was auto published" {
+  hammer --csv --no-headers content-view version list --organization="${ORGANIZATION}" \
+    --content-view="${AUTO_PUBLISH_COMPOSITE_VIEW}" --fields=description > auto_publish_composite_versions
+
+  diff auto_publish_composite_versions fixtures/auto_publish_composite_versions
+}
+
 @test "fetch rpm from yum repository on old path" {
   tCheckPulpYumContent "${HOSTNAME}" "pulp/repos" "Library"
 }

bats/fixtures/auto_publish_composite_versions

@@ -0,0 +1,11 @@
+Auto Publish - Triggered by 'Component 1 1.1'
+"Errata:
+    RHEA-2012:0055
+
+Packages:
+    penguin-0.9.1-1.noarch
+    shark-0.1-1.noarch
+    walrus-5.21-1.noarch"
+Auto Publish - Triggered by 'Component 1 1.0'
+Auto Publish - Triggered by 'Test CV 2.0'
+Auto Publish - Triggered by 'Test CV 1.0'

bats/fixtures/content.bash

@@ -17,6 +17,7 @@ LIFECYCLE_ENVIRONMENT="Test"
 CONTENT_VIEW="Test CV"
 CONTENT_VIEW_2="Component 1"
 CONTENT_VIEW_3="Composite"
+AUTO_PUBLISH_COMPOSITE_VIEW="AutoPublishComposite"
 LIBRARY="Export-Library"
 IMPORT_LIBRARY="Import-Library"
 ACTIVATION_KEY="Test AK"