Fixup openshift-ansible Version during stagecut

openshift-eng · May 31, 2017 · ca7f5b2 · ca7f5b2
1 parent 843abf7
commit ca7f5b2
Showing 1 changed file with 28 additions and 2 deletions.
diff --git a/jobs/build/stagecut/scripts/stagecut.sh b/jobs/build/stagecut/scripts/stagecut.sh
@@ -37,12 +37,38 @@ for repo in $@; do
             git push origin "stage-${LAST_SPRINT_NUMBER}"
             git checkout stage
             git reset --hard master
-            git push origin stage --force
+            #git push origin stage --force
+
         else
             echo "Stage branch did not yet exist; creating it..."
             git checkout -b stage
-            git push origin stage
+            #git push origin stage
+        fi
+
+        # If this is the openshift-ansible repository, we need to take an extra
+        # step to ensure CI continues working. During the installer CI job,
+        # master is extracted and tito tag is run. The tag created must be unique. Prior
+        # to stagecut, this is always true. During stagecut, however,
+        # openshift-ansible.spec in master falls behind the tags being created
+        # by builds in stage.
+        # To resolve this, during stagecut, openshift-ansible.spec in master
+        # is tweaked to have four fields instead of 3 so that CI tito tags
+        # won't conflict with tags created by stage builds.
+        if [ -f "openshift-ansible.spec" ]; then
+            git checkout master
+            export VERSION="v$(grep Version: openshift-ansible.spec | awk '{print $2}')"
+            if [ ! -z "$(echo ${VERSION} | cut -d . -f 4)" ]; then
+                echo "openshift-ansible already contains a 4 field Version in spec file. Something is wrong, so refusing to proceed."
+                echo "Performing a standard openshift-ansible build after stagecut ended should have restored a three field version."
+                exit 1
+            fi
+            VERSION="${VERSION}.0" # Add another field
+            sed -i "s/Version:.*/Version:        ${VERSION}/" openshift-ansible.spec
+            git add openshift-ansible.spec
+            git commit -m "Adding version field for stagecut"
+            # git push origin master
         fi
+
     popd
 
     rm -rf "${d}"