Merge remote-tracking branch 'origin/feature/OP-22224-OES-upgrade-1.3…

…3.x' into feature/OP-22224-OES-upgrade-1.33.x # Conflicts: # build.gradle # settings.gradle
OpsMx · Jun 24, 2024 · 312e26e · 312e26e
2 parents 0647a3c + fc00dda
commit 312e26e
Show file tree

Hide file tree

Showing 4 changed files with 21 additions and 20 deletions.
diff --git a/.github/workflows/kayenta-oes-branch.yml b/.github/workflows/kayenta-oes-branch.yml
@@ -62,10 +62,12 @@ jobs:
           ORG_GRADLE_PROJECT_version: ${{ steps.build_variables.outputs.VERSION }}
         run: |
         
+            sed  -e 's/NEXUS_URL/${{ secrets.NEXUS_URL }}/'  -i settings.gradle
             sed  -e 's/NEXUS_USERNAME/${{ secrets.NEXUS_USERNAME }}/' -i settings.gradle
             sed  -e 's/NEXUS_PASSWORD/${{ secrets.NEXUS_PASSWORD }}/' -i settings.gradle
             sed  -e 's/NEXUS_USERNAME/${{ secrets.NEXUS_USERNAME }}/' -i build.gradle
             sed  -e 's/NEXUS_PASSWORD/${{ secrets.NEXUS_PASSWORD }}/' -i build.gradle
+            sed  -e 's/NEXUS_URL/${{ secrets.NEXUS_URL }}/' -i build.gradle
            
             ./gradlew --no-daemon -PenableCrossCompilerPlugin=true kayenta-web:installDist -x test 
 

diff --git a/.github/workflows/kayenta-oes.yml b/.github/workflows/kayenta-oes.yml
@@ -32,7 +32,7 @@ jobs:
           echo ::set-output name=REPO::ubi8-kayenta-cve
           #echo ::set-output name=VERSION::"1.33.x$(date --utc +'%Y%m%d')"
           #echo ::set-output name=VERSION::"1.33.x$(date --utc +'%-m%d')"
-          echo ::set-output name=VERSION::"1.33.x"
+          echo ::set-output name=VERSION::"1.33.2"
           echo "::set-output name=GITHASH::$(git rev-parse --short HEAD)"
           echo "::set-output name=BUILDDATE::$(date -u +"%Y%m%d%H%M")"
       - name: Login to Quay
@@ -47,12 +47,14 @@ jobs:
           ORG_GRADLE_PROJECT_version: ${{ steps.build_variables.outputs.VERSION }}
         run: |
         
-            sed  -e 's/NEXUS_USERNAME/${{ secrets.NEXUS_USERNAME }}/' -i settings.gradle
-            sed  -e 's/NEXUS_PASSWORD/${{ secrets.NEXUS_PASSWORD }}/' -i settings.gradle
-            sed  -e 's/NEXUS_USERNAME/${{ secrets.NEXUS_USERNAME }}/' -i build.gradle
-            sed  -e 's/NEXUS_PASSWORD/${{ secrets.NEXUS_PASSWORD }}/' -i build.gradle
+              sed  -e 's|NEXUS_USERNAME|${{ secrets.NEXUS_USERNAME }}|' -i settings.gradle
+              sed  -e 's|NEXUS_PASSWORD|${{ secrets.NEXUS_PASSWORD }}|' -i settings.gradle
+              sed  -e 's|NEXUS_USERNAME|${{ secrets.NEXUS_USERNAME }}|' -i build.gradle
+              sed  -e 's|NEXUS_PASSWORD|${{ secrets.NEXUS_PASSWORD }}|' -i build.gradle
+              sed  -e 's|NEXUS_URL|${{ secrets.NEXUS_URL }}|' -i settings.gradle
+              sed  -e 's|NEXUS_URL|${{ secrets.NEXUS_URL }}|' -i build.gradle
            
-            ./gradlew --no-daemon -PenableCrossCompilerPlugin=true kayenta-web:installDist -x test 
+              ./gradlew --no-daemon -PenableCrossCompilerPlugin=true kayenta-web:installDist -x test 
 
       - name: dockerBuildpush
         uses: docker/build-push-action@v2
@@ -61,7 +63,7 @@ jobs:
           build-args: |
             CUSTOMPLUGIN_RELEASEORG=opsmx
             CUSTOMPLUGIN_RELEASEREPO=armory-observability-plugin
-            CUSTOMPLUGIN_RELEASEVERSION=v1.0.1
+            CUSTOMPLUGIN_RELEASE_VERSION=1.0.1
           file: docker/ubi8/Dockerfile-fips
           push: true
           tags: |

diff --git a/docker/ubi8/Dockerfile-fips b/docker/ubi8/Dockerfile-fips
@@ -21,7 +21,7 @@ ENV JAVA_HOME=/opsmx-java-runtime \
     PATH=${PATH}:/opsmx-java-runtime/bin \
     WORK_DIR=/opsmx/workdir \
     CONF_DIR=/opsmx/conf
-
+ENV  SERVICE_PLUGIN_PATH=/opt/kayenta/plugins
 # Enabling fips mode
 RUN fips-mode-setup --enable
 
@@ -34,23 +34,20 @@ RUN yum -y install wget
 
 #RUN yum -y update
 RUN adduser spinnaker
-RUN mkdir -p /opt/kayenta/plugins
+RUN mkdir -p ${SERVICE_PLUGIN_PATH} 
+
 
-#custom plugin zip files adding
+ARG CUSTOMPLUGIN_RELEASE_VERSION
+ENV CUSTOMPLUGIN_RELEASE_VERSION=$CUSTOMPLUGIN_RELEASE_VERSION
 ARG CUSTOMPLUGIN_RELEASEORG
 ENV CUSTOMPLUGIN_RELEASEORG=$CUSTOMPLUGIN_RELEASEORG
-
 ARG CUSTOMPLUGIN_RELEASEREPO
 ENV CUSTOMPLUGIN_RELEASEREPO=$CUSTOMPLUGIN_RELEASEREPO
 
-ARG CUSTOMPLUGIN_RELEASEVERSION
-ENV CUSTOMPLUGIN_RELEASEVERSION=$CUSTOMPLUGIN_RELEASEVERSION
-
-RUN wget -O Armory.armory-observability-plugin-${CUSTOMPLUGIN_RELEASEVERSION}-SNAPSHOT.zip -c https://github.com/${CUSTOMPLUGIN_RELEASEORG}/${CUSTOMPLUGIN_RELEASEREPO}/releases/download/${CUSTOMPLUGIN_RELEASEVERSION}/armory-observability-plugin-${CUSTOMPLUGIN_RELEASEVERSION}.zip -P /opt/kayenta/plugins 
-
-RUN mv Armory.armory-observability-plugin-${CUSTOMPLUGIN_RELEASEVERSION}-SNAPSHOT.zip /opt/kayenta/plugins/
+RUN wget -O Armory.armory-observability-plugin-${CUSTOMPLUGIN_RELEASE_VERSION}.zip -c https://github.com/${CUSTOMPLUGIN_RELEASEORG}/${CUSTOMPLUGIN_RELEASEREPO}/releases/download/v${CUSTOMPLUGIN_RELEASE_VERSION}/armory-observability-plugin-v${CUSTOMPLUGIN_RELEASE_VERSION}.zip -P ${SERVICE_PLUGIN_PATH}
+RUN mv Armory.armory-observability-plugin-${CUSTOMPLUGIN_RELEASE_VERSION}.zip ${SERVICE_PLUGIN_PATH}
 
-RUN chmod -R 777 /opt/kayenta/plugins/
+RUN chmod -R 777 ${SERVICE_PLUGIN_PATH}
 RUN chown -R spinnaker:spinnaker /opt/
 RUN yum -y remove  tar  vim vi
 RUN yum -y remove clean all && rm -rf /var/cache

diff --git a/gradle.properties b/gradle.properties
@@ -1,5 +1,5 @@
-orcaVersion=3-0-SNAPSHOT
+orcaVersion=1.33.0-SNAPSHOT
 org.gradle.parallel=true
-spinnakerGradleVersion=1-0-SNAPSHOT
+spinnakerGradleVersion=1.33.0-SNAPSHOT
 #targetJava11=true
 org.gradle.jvmargs=-Xmx2g