test with different application and embedded-cluster versions to ensure we're not confusing the two (#473)

laverya · web-flow · commit 21895bd0787c · 2024-04-02T01:14:54.000+09:00
* test with different application and embedded-cluster versions to ensure we're not confusing the two

* f

* log failed install args

* f

* ensure on-merge releases use correct binary version
diff --git a/.github/workflows/pull-request.yaml b/.github/workflows/pull-request.yaml
@@ -77,17 +77,17 @@ jobs:
         sed -i "s/__version_string__/${SHORT_SHA}-upgrade/g" e2e/kots-release-upgrade/cluster-config.yaml
 
         # re-promote a release containing an old version of embedded-cluster to test upgrades
-        replicated release promote 807 2cHXb1RCttzpR0xvnNWyaZCgDBP --version "${SHORT_SHA}-pre-minio-removal"
+        replicated release promote 807 2cHXb1RCttzpR0xvnNWyaZCgDBP --version "appver-${SHORT_SHA}-pre-minio-removal"
 
-        replicated release create --yaml-dir e2e/kots-release-install --promote CI --version "${SHORT_SHA}"
-        replicated release create --yaml-dir e2e/kots-release-upgrade --promote CI --version "${SHORT_SHA}-upgrade"
+        replicated release create --yaml-dir e2e/kots-release-install --promote CI --version "appver-${SHORT_SHA}"
+        replicated release create --yaml-dir e2e/kots-release-upgrade --promote CI --version "appver-${SHORT_SHA}-upgrade"
     - name: Build CI binary
       run: |
         export SHORT_SHA=dev-$(git rev-parse --short=7 HEAD)
         echo "# channel release object" > e2e/kots-release-install/release.yaml
         echo 'channelID: "2cHXb1RCttzpR0xvnNWyaZCgDBP"' >> e2e/kots-release-install/release.yaml
         echo 'appSlug: "embedded-cluster-smoke-test-staging-app"' >> e2e/kots-release-install/release.yaml
-        echo "versionLabel: \"${SHORT_SHA}\"" >> e2e/kots-release-install/release.yaml
+        echo "versionLabel: \"appver-${SHORT_SHA}\"" >> e2e/kots-release-install/release.yaml
         cat e2e/kots-release-install/release.yaml
         cp output/bin/embedded-cluster output/bin/embedded-cluster-original
         make embedded-release VERSION="${SHORT_SHA}" # this is done after the metadata.json is generated so as to not include additional charts
@@ -115,7 +115,7 @@ jobs:
         sed -i "s/__version_string__/${SHORT_SHA}-upgrade/g" e2e/kots-release-upgrade/cluster-config.yaml
         
         rm e2e/kots-release-install/release.yaml
-        replicated release create --yaml-dir e2e/kots-release-install --promote CI-airgap --version "${SHORT_SHA}"
+        replicated release create --yaml-dir e2e/kots-release-install --promote CI-airgap --version "appver-${SHORT_SHA}"
 
     - name: upload binary
       uses: actions/upload-artifact@v4
diff --git a/.github/workflows/release-dev.yaml b/.github/workflows/release-dev.yaml
@@ -55,20 +55,20 @@ jobs:
           sed -i "s/__version_string__/${SHORT_SHA}-upgrade/g" e2e/kots-release-upgrade/cluster-config.yaml
 
           # re-promote a release containing an old version of embedded-cluster to test upgrades
-          replicated release promote 807 2cHXb1RCttzpR0xvnNWyaZCgDBP --version "${SHORT_SHA}-pre-minio-removal"
+          replicated release promote 807 2cHXb1RCttzpR0xvnNWyaZCgDBP --version "appver-${SHORT_SHA}-pre-minio-removal"
           
-          replicated release create --yaml-dir e2e/kots-release-install --promote CI --version "${SHORT_SHA}"
-          replicated release create --yaml-dir e2e/kots-release-upgrade --promote CI --version "${SHORT_SHA}-upgrade"
+          replicated release create --yaml-dir e2e/kots-release-install --promote CI --version "appver-${SHORT_SHA}"
+          replicated release create --yaml-dir e2e/kots-release-upgrade --promote CI --version "appver-${SHORT_SHA}-upgrade"
       - name: Build CI binary
         run: |
           export SHORT_SHA=dev-$(git rev-parse --short=7 HEAD)
           echo "# channel release object" > e2e/kots-release-install/release.yaml
           echo 'channelID: "2cHXb1RCttzpR0xvnNWyaZCgDBP"' >> e2e/kots-release-install/release.yaml
           echo 'appSlug: "embedded-cluster-smoke-test-staging-app"' >> e2e/kots-release-install/release.yaml
-          echo "versionLabel: \"${SHORT_SHA}\"" >> e2e/kots-release-install/release.yaml
+          echo "versionLabel: \"appver-${SHORT_SHA}\"" >> e2e/kots-release-install/release.yaml
           cat e2e/kots-release-install/release.yaml
           cp output/bin/embedded-cluster output/bin/embedded-cluster-original
-          make embedded-release # this is done after the metadata.json is generated so as to not include additional charts
+          make embedded-release VERSION="${SHORT_SHA}" # this is done after the metadata.json is generated so as to not include additional charts
       - name: Cache files for integration test
         env:
           S3_BUCKET: "tf-staging-embedded-cluster-bin"
@@ -92,7 +92,7 @@ jobs:
           sed -i "s/__version_string__/${SHORT_SHA}-upgrade/g" e2e/kots-release-upgrade/cluster-config.yaml
           
           rm e2e/kots-release-install/release.yaml
-          replicated release create --yaml-dir e2e/kots-release-install --promote CI-airgap --version "${SHORT_SHA}"
+          replicated release create --yaml-dir e2e/kots-release-install --promote CI-airgap --version "appver-${SHORT_SHA}"
 
       - name: upload binary
         uses: actions/upload-artifact@v4
diff --git a/e2e/install_test.go b/e2e/install_test.go
@@ -422,7 +422,7 @@ func TestSingleNodeAirgapInstallationUbuntuJammy(t *testing.T) {
 
 	t.Logf("%s: downloading airgap file", time.Now().Format(time.RFC3339))
 	// download airgap bundle
-	airgapURL := fmt.Sprintf("https://staging.replicated.app/embedded/embedded-cluster-smoke-test-staging-app/ci-airgap/%s?airgap=true", os.Getenv("SHORT_SHA"))
+	airgapURL := fmt.Sprintf("https://staging.replicated.app/embedded/embedded-cluster-smoke-test-staging-app/ci-airgap/appver-%s?airgap=true", os.Getenv("SHORT_SHA"))
 
 	req, err := http.NewRequest("GET", airgapURL, nil)
 	if err != nil {
diff --git a/e2e/scripts/check-postupgrade-state.sh b/e2e/scripts/check-postupgrade-state.sh
@@ -32,7 +32,7 @@ main() {
     sleep 30 # wait for kubectl to become available
 
     echo "upgrading to version ${installation_version}-upgrade"
-    kubectl kots upstream upgrade embedded-cluster-smoke-test-staging-app --namespace kotsadm --deploy-version-label="${installation_version}-upgrade"
+    kubectl kots upstream upgrade embedded-cluster-smoke-test-staging-app --namespace kotsadm --deploy-version-label="appver-${installation_version}-upgrade"
 
     sleep 30
 
diff --git a/e2e/scripts/vandoor-prepare.sh b/e2e/scripts/vandoor-prepare.sh
@@ -12,8 +12,8 @@ main() {
     apt-get update
     apt-get install curl ca-certificates -y
 
-    echo "downloading from https://staging.replicated.app/embedded/embedded-cluster-smoke-test-staging-app/ci/${app_version_label}"
-    curl "https://staging.replicated.app/embedded/embedded-cluster-smoke-test-staging-app/ci/${app_version_label}" -H "Authorization: ${license_id}" -o ec-release.tgz
+    echo "downloading from https://staging.replicated.app/embedded/embedded-cluster-smoke-test-staging-app/ci/appver-${app_version_label}"
+    curl "https://staging.replicated.app/embedded/embedded-cluster-smoke-test-staging-app/ci/appver-${app_version_label}" -H "Authorization: ${license_id}" -o ec-release.tgz
     tar xzf ec-release.tgz
 
     mv embedded-cluster-smoke-test-staging-app /usr/local/bin/embedded-cluster
diff --git a/pkg/addons/adminconsole/adminconsole.go b/pkg/addons/adminconsole/adminconsole.go
@@ -287,6 +287,7 @@ func (a *AdminConsole) Outro(ctx context.Context, cli client.Client) error {
 
 	if _, err := helpers.RunCommand(kotsBinPath, installArgs...); err != nil {
 		loading.Close()
+		loading.Debugf("kubectl-kots %v", installArgs)
 		return fmt.Errorf("unable to install the application: %w", err)
 	}
 

Original file line number	Diff line number	Diff line change
`@@ -287,6 +287,7 @@ func (a *AdminConsole) Outro(ctx context.Context, cli client.Client) error {`
`287`	`287`
`288`	`288`	`if _, err := helpers.RunCommand(kotsBinPath, installArgs...); err != nil {`
`289`	`289`	`loading.Close()`
	`290`	`+ loading.Debugf("kubectl-kots %v", installArgs)`
`290`	`291`	`return fmt.Errorf("unable to install the application: %w", err)`
`291`	`292`	`}`
`292`	`293`