..

.drone.jsonnet

@@ -59,6 +59,8 @@ local gen_pipeline(distro) =
      name: 'dockersock',
      temp: {}, 
    },],
+   trigger:
+   { event: {exclude: ['tag'],},},
    when:
      { event: {exclude: ['tag']},  
      },
@@ -67,18 +69,43 @@ local gen_pipeline(distro) =
 local gen_release() =
   {kind: 'pipeline',
    type: 'docker',
+   image: 'guisea/ansible-molecule:alpine-latest',
    name: 'Generate Release',
    commands: [
       'sleep 10', // give docker enough time to start
+      'env',
       'mkdir ${DRONE_REPO_NAME}',
       'rsync -a . ${DRONE_REPO_NAME} --exclude ${DRONE_REPO_NAME}',
       'cd ${DRONE_REPO_NAME}',
+      'echo GITEA_USER=${USER}',
+      'apk update && apk add --no-cache curl',
       'tar -czf ../${DRONE_REPO_NAME}.${DRONE_TAG}.tar.gz ./*', // Create an archive of the role
-      'curl --user ${GITEA_USER}:${GITEA_TOKEN} --upload-file ../${DRONE_REPO_NAME}.${DRONE_TAG}.tar.gz https://${GITEA_URL}/api/packages/${GITEA_REPOUSER}/generic/ansible-role-common/${DRONE_TAG}/${DRONE_REPO_NAME}.${DRONE_TAG}.tar.gz',
+      'curl --user ${USER}:${TOKEN} --upload-file ../${DRONE_REPO_NAME}.${DRONE_TAG}.tar.gz https://${URL}/api/packages/${REPOUSER}/generic/ansible-role-common/${DRONE_TAG}/${DRONE_REPO_NAME}.${DRONE_TAG}.tar.gz',
    ],
+   environment:
+     { USER: { from_secret: 'GITEA_USER' },
+       TOKEN: { from_secret: 'GITEA_TOKEN' },
+       REPOUSER: { from_secret: 'GITEA_REPOUSER'},
+       URL: { from_secret: 'GITEA_URL' },
+     },
    when:
    { event: {include: ['tag']},  
    },
+   trigger:
+   { event: {include: ['tag'],},},
+  };
+
+local gen_pipeline_release() =
+  {kind: 'pipeline',
+   type: 'docker',
+   name: 'Generate release from tag',
+   steps: 
+    [gen_release()],
+   when:
+     { event: {include: ['tag']},  
+     },
+   trigger:
+   { event: {include: ['tag'],},},
   };
 
 // Generate the output
@@ -90,7 +117,10 @@ local gen_release() =
   {kind: 'pipeline',
    type: 'docker',
    name: 'Notify normal',
+   clone: {disable: true},
    steps: [email_notification()],
+   trigger:
+   { event: {exclude: ['tag'],},},
    when:
      {  status: [ 'success', 'failure' ] ,
         event: {exclude: ['tag']}, 
@@ -99,16 +129,19 @@ local gen_release() =
       ['Test on %(distro)s' % { distro: distro }
         for distro in distros]
   },
-  gen_release(),
+  gen_pipeline_release(),
   {kind: 'pipeline',
    type: 'docker',
+   clone: {disable: true},
    name: 'Notify Tagged release',
    steps: [email_notification()],
+   trigger:
+   { event: {include: ['tag'],},},
    when:
      {  status: [ 'success', 'failure' ] ,
         event: {include: ['tag']}, 
      },
     depends_on: 
-      ['Generate Release']
+      ['Generate release from tag']
   },
 ]